Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'jk/reflog-date' into maint | Junio C Hamano | 2016-09-08 | 6 | -10/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | date: clarify --date=raw descriptionjk/reflog-date | Junio C Hamano | 2016-07-27 | 1 | -1/+5 | |
| * | | | | | | | | | | | date: add "unix" format | Jeff King | 2016-07-27 | 5 | -1/+19 | |
| * | | | | | | | | | | | date: document and test "raw-local" mode | Jeff King | 2016-07-27 | 2 | -2/+6 | |
| * | | | | | | | | | | | doc/pretty-formats: explain shortening of %gd | Jeff King | 2016-07-22 | 1 | -3/+6 | |
| * | | | | | | | | | | | doc/pretty-formats: describe index/time formats for %gd | Jeff King | 2016-07-22 | 1 | -2/+5 | |
| * | | | | | | | | | | | doc/rev-list-options: explain "-g" output formats | Jeff King | 2016-07-22 | 1 | -4/+19 | |
| * | | | | | | | | | | | doc/rev-list-options: clarify "commit@{Nth}" for "-g" option | Jeff King | 2016-07-22 | 1 | -2/+2 | |
* | | | | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2016-09-08 | 10 | -90/+112 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | merge: avoid "safer crlf" during recording of merge results | Junio C Hamano | 2016-07-12 | 4 | -31/+43 | |
| * | | | | | | | | | | | | convert: unify the "auto" handling of CRLF | Torsten Bögershausen | 2016-07-06 | 7 | -59/+69 | |
* | | | | | | | | | | | | | Merge branch 'jk/common-main' into maint | Junio C Hamano | 2016-09-08 | 53 | -153/+126 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'jk/common-main-2.8' into jk/common-main | Junio C Hamano | 2016-07-06 | 53 | -150/+123 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | mingw: declare main()'s argv as constjk/common-main-2.8 | Johannes Schindelin | 2016-07-06 | 2 | -8/+2 | |
| | * | | | | | | | | | | | | common-main: call git_setup_gettext() | Jeff King | 2016-07-01 | 12 | -22/+2 | |
| | * | | | | | | | | | | | | common-main: call restore_sigpipe_to_default() | Jeff King | 2016-07-01 | 2 | -23/+23 | |
| | * | | | | | | | | | | | | common-main: call sanitize_stdfds() | Jeff King | 2016-07-01 | 4 | -17/+9 | |
| | * | | | | | | | | | | | | common-main: call git_extract_argv0_path() | Jeff King | 2016-07-01 | 12 | -19/+4 | |
| | * | | | | | | | | | | | | add an extra level of indirection to main() | Jeff King | 2016-07-01 | 52 | -69/+91 | |
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Git 2.9.3v2.9.3 | Junio C Hamano | 2016-08-12 | 3 | -2/+13 | |
* | | | | | | | | | | | | | Merge branch 'jk/difftool-in-subdir' into maint | Junio C Hamano | 2016-08-12 | 2 | -59/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | difftool: use Git::* functions instead of passing around state | David Aguilar | 2016-07-28 | 1 | -31/+21 | |
| * | | | | | | | | | | | | | difftool: avoid $GIT_DIR and $GIT_WORK_TREE | David Aguilar | 2016-07-28 | 2 | -21/+20 | |
| * | | | | | | | | | | | | | difftool: fix argument handling in subdirs | John Keeping | 2016-07-19 | 1 | -10/+3 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/reset-ident-time-per-commit' into maint | Junio C Hamano | 2016-08-12 | 3 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | am: reset cached ident date for each patchjk/reset-ident-time-per-commit | Jeff King | 2016-08-01 | 3 | -0/+8 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Yet another batch for 2.9.3 | Junio C Hamano | 2016-08-10 | 1 | -0/+68 | |
* | | | | | | | | | | | | | Merge branch 'jh/clean-smudge-f-doc' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | clarify %f documentationjh/clean-smudge-f-doc | Joey Hess | 2016-08-03 | 1 | -0/+5 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addstr' into maint | Junio C Hamano | 2016-08-10 | 7 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s"rs/use-strbuf-addstr | René Scharfe | 2016-08-05 | 3 | -3/+3 | |
| * | | | | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf | René Scharfe | 2016-08-01 | 4 | -6/+6 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'cp/completion-clone-recurse-submodules' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | completion: add option '--recurse-submodules' to 'git clone'cp/completion-clone-recurse-submodules | Chris Packham | 2016-07-27 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/t4205-cleanup' into maint | Junio C Hamano | 2016-08-10 | 1 | -198/+200 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | t4205: indent here documentsjk/t4205-cleanup | Jeff King | 2016-07-27 | 1 | -196/+196 | |
| * | | | | | | | | | | | | | t4205: drop top-level &&-chaining | Jeff King | 2016-07-27 | 1 | -2/+4 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jc/hashmap-doc-init' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | hashmap: clarify that hashmap_entry can safely be discardedjc/hashmap-doc-init | Junio C Hamano | 2016-08-02 | 1 | -0/+5 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'js/nedmalloc-gcc6-warnings' into maint | Junio C Hamano | 2016-08-10 | 1 | -9/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | nedmalloc: work around overzealous GCC 6 warningjs/nedmalloc-gcc6-warnings | René Scharfe | 2016-08-05 | 1 | -5/+4 | |
| * | | | | | | | | | | | | | nedmalloc: fix misleading indentation | Johannes Schindelin | 2016-08-04 | 1 | -4/+4 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'nd/fbsd-lazy-mtime' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | t7063: work around FreeBSD's lazy mtime update featurend/fbsd-lazy-mtime | Nguyễn Thái Ngọc Duy | 2016-08-04 | 1 | -1/+16 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'ab/gitweb-link-html-escape' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | gitweb: escape link body in format_ref_markerab/gitweb-link-html-escape | Andreas Brauchli | 2016-08-01 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'js/t4130-rename-without-ino' into maint | Junio C Hamano | 2016-08-10 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | t4130: work around Windows limitationjs/t4130-rename-without-ino | Johannes Sixt | 2016-08-03 | 1 | -3/+7 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jc/grep-commandline-vs-configuration' into maint | Junio C Hamano | 2016-08-10 | 4 | -16/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | grep: further simplify setting the pattern typejc/grep-commandline-vs-configuration | Junio C Hamano | 2016-07-25 | 4 | -16/+29 |