Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'mg/cherry-pick-multi-on-unborn' into maint | Junio C Hamano | 2016-07-06 | 1 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | cherry-pick: allow to pick to unborn branchesmg/cherry-pick-multi-on-unborn | Michael J Gruber | 2016-06-06 | 1 | -5/+6 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint | Junio C Hamano | 2016-07-06 | 3 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | rebase: update comment about FreeBSD /bin/shem/newer-freebsd-shells-are-fine-with-returns | Ed Maste | 2016-06-17 | 3 | -6/+6 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'lv/status-say-working-tree-not-directory' into maint | Junio C Hamano | 2016-07-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Use "working tree" instead of "working directory" for git statuslv/status-say-working-tree-not-directory | Lars Vogel | 2016-06-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'nb/gnome-keyring-build' into maint | Junio C Hamano | 2016-07-06 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | gnome-keyring: Don't hard-code pkg-config executablenb/gnome-keyring-build | Heiko Becker | 2016-06-14 | 1 | -2/+3 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'et/add-chmod-x' into maint | Junio C Hamano | 2016-07-06 | 6 | -20/+68 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | add: add --chmod=+x / --chmod=-x options | Edward Thomson | 2016-06-07 | 6 | -20/+68 | |
* | | | | | | | | | | | | | Merge branch 'jk/avoid-unbounded-alloca' into maint | Junio C Hamano | 2016-07-06 | 1 | -6/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | tree-diff: avoid alloca for large allocationsjk/avoid-unbounded-alloca | Jeff King | 2016-06-07 | 1 | -6/+16 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'rj/compat-regex-size-max-fix' into maint | Junio C Hamano | 2016-07-06 | 2 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | regex: fix a SIZE_MAX macro redefinition warningrj/compat-regex-size-max-fix | Ramsay Jones | 2016-06-06 | 2 | -2/+1 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'vs/prompt-avoid-unset-variable' into maint | Junio C Hamano | 2016-07-06 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_shavs/prompt-avoid-unset-variable | Ville Skyttä | 2016-06-06 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'sg/reflog-past-root' into maint | Junio C Hamano | 2016-07-06 | 3 | -1/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | reflog: continue walking the reflog past root commits | SZEDER Gábor | 2016-06-06 | 3 | -1/+29 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'dn/gpg-doc' into maint | Junio C Hamano | 2016-07-06 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Documentation: GPG capitalizationdn/gpg-doc | Dave Nicolson | 2016-06-16 | 2 | -2/+2 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'ap/git-svn-propset-doc' into maint | Junio C Hamano | 2016-07-06 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git-svn: document the 'git svn propset' commandap/git-svn-propset-doc | Alfred Perlstein | 2016-06-15 | 1 | -0/+14 | |
* | | | | | | | | | | | | | | Merge branch 'tr/doc-tt' into maint | Junio C Hamano | 2016-07-06 | 36 | -217/+224 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | doc: change configuration variables formattr/doc-tt | Tom Russello | 2016-06-08 | 17 | -86/+86 | |
| * | | | | | | | | | | | | | | doc: more consistency in environment variables format | Tom Russello | 2016-06-08 | 17 | -27/+27 | |
| * | | | | | | | | | | | | | | doc: change environment variables format | Tom Russello | 2016-06-08 | 9 | -101/+101 | |
| * | | | | | | | | | | | | | | doc: clearer rule about formatting literals | Tom Russello | 2016-06-08 | 1 | -3/+10 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | mailmap: use main email address for dturner | David Turner | 2016-07-06 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | Start preparing for 2.9.1 | Junio C Hamano | 2016-06-27 | 2 | -1/+29 | |
* | | | | | | | | | | | | | | Merge branch 'rs/xdiff-hunk-with-func-line' into maint | Junio C Hamano | 2016-06-27 | 10 | -93/+365 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-line | René Scharfe | 2016-06-09 | 2 | -2/+25 | |
| * | | | | | | | | | | | | | | grep: -W: don't extend context to trailing empty lines | René Scharfe | 2016-05-31 | 2 | -3/+27 | |
| * | | | | | | | | | | | | | | t7810: add test for grep -W and trailing empty context lines | René Scharfe | 2016-05-31 | 1 | -3/+16 | |
| * | | | | | | | | | | | | | | xdiff: don't trim common tail with -W | René Scharfe | 2016-05-31 | 2 | -7/+5 | |
| * | | | | | | | | | | | | | | xdiff: -W: don't include common trailing empty lines in context | René Scharfe | 2016-05-31 | 2 | -2/+4 | |
| * | | | | | | | | | | | | | | xdiff: ignore empty lines before added functions with -W | René Scharfe | 2016-05-31 | 2 | -3/+21 | |
| * | | | | | | | | | | | | | | xdiff: handle appended chunks better with -W | René Scharfe | 2016-05-31 | 2 | -4/+25 | |
| * | | | | | | | | | | | | | | xdiff: factor out match_func_rec() | René Scharfe | 2016-05-31 | 1 | -4/+11 | |
| * | | | | | | | | | | | | | | t4051: rewrite, add more tests | René Scharfe | 2016-05-31 | 6 | -74/+240 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/rev-list-count-with-bitmap' into maint | Junio C Hamano | 2016-06-27 | 2 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | rev-list: disable bitmaps when "-n" is used with listing objectsjk/rev-list-count-with-bitmap | Jeff King | 2016-06-03 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | rev-list: "adjust" results of "--count --use-bitmap-index -n" | Jeff King | 2016-06-03 | 2 | -0/+9 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'et/pretty-format-c-auto' into maint | Junio C Hamano | 2016-06-27 | 2 | -8/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | format_commit_message: honor `color=auto` for `%C(auto)`et/pretty-format-c-auto | Edward Thomson | 2016-05-27 | 2 | -8/+20 | |
* | | | | | | | | | | | | | | | | Merge branch 'ew/daemon-socket-keepalive' into maint | Junio C Hamano | 2016-06-27 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | daemon: enable SO_KEEPALIVE for all sockets | Eric Wong | 2016-05-25 | 1 | -0/+14 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Git 2.9v2.9.0 | Junio C Hamano | 2016-06-13 | 2 | -1/+6 | |
* | | | | | | | | | | | | | | | Merge tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-po | Junio C Hamano | 2016-06-12 | 10 | -15125/+19378 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | l10n: ko.po: Update Korean translation | Changwoo Ryu | 2016-06-12 | 1 | -1393/+1799 | |
| * | | | | | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru | Jiang Xin | 2016-06-11 | 1 | -1404/+1767 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |