summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'mg/cherry-pick-multi-on-unborn' into maintJunio C Hamano2016-07-061-5/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cherry-pick: allow to pick to unborn branchesmg/cherry-pick-multi-on-unbornMichael J Gruber2016-06-061-5/+6
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maintJunio C Hamano2016-07-063-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase: update comment about FreeBSD /bin/shem/newer-freebsd-shells-are-fine-with-returnsEd Maste2016-06-173-6/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'lv/status-say-working-tree-not-directory' into maintJunio C Hamano2016-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use "working tree" instead of "working directory" for git statuslv/status-say-working-tree-not-directoryLars Vogel2016-06-091-1/+1
* | | | | | | | | | | | Merge branch 'nb/gnome-keyring-build' into maintJunio C Hamano2016-07-061-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gnome-keyring: Don't hard-code pkg-config executablenb/gnome-keyring-buildHeiko Becker2016-06-141-2/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-07-066-20/+68
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add: add --chmod=+x / --chmod=-x optionsEdward Thomson2016-06-076-20/+68
* | | | | | | | | | | | | Merge branch 'jk/avoid-unbounded-alloca' into maintJunio C Hamano2016-07-061-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tree-diff: avoid alloca for large allocationsjk/avoid-unbounded-allocaJeff King2016-06-071-6/+16
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rj/compat-regex-size-max-fix' into maintJunio C Hamano2016-07-062-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | regex: fix a SIZE_MAX macro redefinition warningrj/compat-regex-size-max-fixRamsay Jones2016-06-062-2/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'vs/prompt-avoid-unset-variable' into maintJunio C Hamano2016-07-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_shavs/prompt-avoid-unset-variableVille Skyttä2016-06-061-3/+3
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-07-063-1/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reflog: continue walking the reflog past root commitsSZEDER Gábor2016-06-063-1/+29
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dn/gpg-doc' into maintJunio C Hamano2016-07-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation: GPG capitalizationdn/gpg-docDave Nicolson2016-06-162-2/+2
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ap/git-svn-propset-doc' into maintJunio C Hamano2016-07-061-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn: document the 'git svn propset' commandap/git-svn-propset-docAlfred Perlstein2016-06-151-0/+14
* | | | | | | | | | | | | | Merge branch 'tr/doc-tt' into maintJunio C Hamano2016-07-0636-217/+224
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | doc: change configuration variables formattr/doc-ttTom Russello2016-06-0817-86/+86
| * | | | | | | | | | | | | | doc: more consistency in environment variables formatTom Russello2016-06-0817-27/+27
| * | | | | | | | | | | | | | doc: change environment variables formatTom Russello2016-06-089-101/+101
| * | | | | | | | | | | | | | doc: clearer rule about formatting literalsTom Russello2016-06-081-3/+10
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | mailmap: use main email address for dturnerDavid Turner2016-07-061-0/+1
* | | | | | | | | | | | | | Start preparing for 2.9.1Junio C Hamano2016-06-272-1/+29
* | | | | | | | | | | | | | Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano2016-06-2710-93/+365
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-lineRené Scharfe2016-06-092-2/+25
| * | | | | | | | | | | | | | grep: -W: don't extend context to trailing empty linesRené Scharfe2016-05-312-3/+27
| * | | | | | | | | | | | | | t7810: add test for grep -W and trailing empty context linesRené Scharfe2016-05-311-3/+16
| * | | | | | | | | | | | | | xdiff: don't trim common tail with -WRené Scharfe2016-05-312-7/+5
| * | | | | | | | | | | | | | xdiff: -W: don't include common trailing empty lines in contextRené Scharfe2016-05-312-2/+4
| * | | | | | | | | | | | | | xdiff: ignore empty lines before added functions with -WRené Scharfe2016-05-312-3/+21
| * | | | | | | | | | | | | | xdiff: handle appended chunks better with -WRené Scharfe2016-05-312-4/+25
| * | | | | | | | | | | | | | xdiff: factor out match_func_rec()René Scharfe2016-05-311-4/+11
| * | | | | | | | | | | | | | t4051: rewrite, add more testsRené Scharfe2016-05-316-74/+240
* | | | | | | | | | | | | | | Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-272-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rev-list: disable bitmaps when "-n" is used with listing objectsjk/rev-list-count-with-bitmapJeff King2016-06-031-1/+2
| * | | | | | | | | | | | | | | rev-list: "adjust" results of "--count --use-bitmap-index -n"Jeff King2016-06-032-0/+9
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'et/pretty-format-c-auto' into maintJunio C Hamano2016-06-272-8/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | format_commit_message: honor `color=auto` for `%C(auto)`et/pretty-format-c-autoEdward Thomson2016-05-272-8/+20
* | | | | | | | | | | | | | | | Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2016-06-271-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | daemon: enable SO_KEEPALIVE for all socketsEric Wong2016-05-251-0/+14
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Git 2.9v2.9.0Junio C Hamano2016-06-132-1/+6
* | | | | | | | | | | | | | | Merge tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-poJunio C Hamano2016-06-1210-15125/+19378
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2016-06-121-1393/+1799
| * | | | | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-06-111-1404/+1767
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \