aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-28
|\
| * am: counteract gender biasJohannes Schindelin2016-07-08
* | Merge branch 'js/t3404-grammo-fix' into maintJunio C Hamano2016-07-28
|\ \
| * | t3404: fix a grammo (commands are ran -> commands are run)Johannes Schindelin2016-06-29
* | | Merge branch 'nd/doc-new-command' into maintJunio C Hamano2016-07-28
|\ \ \
| * | | new-command.txt: correct the command description fileNguyễn Thái Ngọc Duy2016-06-27
* | | | Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-28
|\ \ \ \
| * | | | gc: fix off-by-one error with gc.autoPackLimitEric Wong2016-06-27
* | | | | Merge branch 'js/color-on-windows-comment' into maintJunio C Hamano2016-07-28
|\ \ \ \ \
| * | | | | color.h: remove obsolete comment about limitations on WindowsJohannes Schindelin2016-06-28
| |/ / / /
* | | | | Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-28
|\ \ \ \ \
| * | | | | doc: typeset HEAD and variants as literalMatthieu Moy2016-06-28
| * | | | | CodingGuidelines: formatting HEAD in documentationMatthieu Moy2016-06-28
| * | | | | doc: typeset long options with argument as literalMatthieu Moy2016-06-28
| * | | | | doc: typeset '--' as literalMatthieu Moy2016-06-28
| * | | | | doc: typeset long command-line options as literalMatthieu Moy2016-06-28
| * | | | | doc: typeset short command-line options as literalMatthieu Moy2016-06-28
| * | | | | Documentation/git-mv.txt: fix whitespace indentationMatthieu Moy2016-06-28
* | | | | | Merge branch 'js/sign-empty-commit-fix' into maintJunio C Hamano2016-07-28
|\ \ \ \ \ \
| * | | | | | commit -S: avoid invalid pointer with empty messageJohannes Schindelin2016-06-29
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maintJunio C Hamano2016-07-28
|\ \ \ \ \ \
| * | | | | | rebase -i: restore autostash on abortPatrick Steinhardt2016-06-29
| |/ / / / /
* | | | | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-07-28
|\ \ \ \ \ \
| * | | | | | grep: fix grepping for "intent to add" filesCharles Bailey2016-07-01
| * | | | | | t7810-grep.sh: fix a whitespace inconsistencyCharles Bailey2016-07-01
| * | | | | | t7810-grep.sh: fix duplicated test nameCharles Bailey2016-07-01
* | | | | | | Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-28
|\ \ \ \ \ \ \
| * | | | | | | reset --hard: skip blank lines when reporting the commit subjectJohannes Schindelin2016-06-29
| * | | | | | | sequencer: use skip_blank_lines() to find the commit subjectJohannes Schindelin2016-06-29
| * | | | | | | commit -C: skip blank lines at the beginning of the messageJohannes Schindelin2016-06-29
| * | | | | | | commit.c: make find_commit_subject() more robustJohannes Schindelin2016-06-22
| * | | | | | | pretty: make the skip_blank_lines() function publicJohannes Schindelin2016-06-22
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'dg/subtree-rebase-test' into maintJunio C Hamano2016-07-28
|\ \ \ \ \ \ \
| * | | | | | | contrib/subtree: Add a test for subtree rebase that loses commitsDavid A. Greene2016-06-28
* | | | | | | | Git 2.9.2v2.9.2Junio C Hamano2016-07-15
* | | | | | | | Merge branch 'jk/tzoffset-fix' into maintJunio C Hamano2016-07-15
|\ \ \ \ \ \ \ \
| * | | | | | | | t0006: skip "far in the future" test when unsigned long is not long enoughJeff King2016-07-15
* | | | | | | | | Git 2.9.1v2.9.1Junio C Hamano2016-07-11
* | | | | | | | | Merge branch 'jc/t2300-setup' into maintJunio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t2300: "git --exec-path" is not usable in $PATH on Windows as-isJohannes Schindelin2016-06-22
* | | | | | | | | | Merge branch 'cb/t7810-test-label-fix' into maintJunio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7810: fix duplicated test titleCharles Bailey2016-06-21
* | | | | | | | | | | Merge branch 'sb/t5614-modernize' into maintJunio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5614: don't use subshellsStefan Beller2016-06-21
* | | | | | | | | | | | Merge branch 'jn/preformatted-doc-url' into maintJunio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: git-htmldocs.googlecode.com is no moreJonathan Nieder2016-06-22
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ao/p4-has-branch-prefix-fix' into maintJunio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: correct hasBranchPrefix verbose outputAndrew Oakley2016-06-22
* | | | | | | | | | | | | Merge branch 'js/perf-on-apple' into maintJunio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | perf: accommodate for MacOSXJohannes Schindelin2016-06-21