summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-0710-75/+69
* Sync with 2.1.2Junio C Hamano2014-09-292-1/+22
|\
| * Git 2.1.2v2.1.2Junio C Hamano2014-09-294-3/+24
| * Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-293-9/+87
| |\
| * \ Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-294-7/+41
| |\ \
| * \ \ Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-292-0/+25
| |\ \ \
| * \ \ \ Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-292-1/+109
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/index-pack-threading-races' into maintJunio C Hamano2014-09-291-2/+31
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-295-2/+153
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'so/rebase-doc' into maintJunio C Hamano2014-09-291-6/+3
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jt/itimer-autoconf'Junio C Hamano2014-09-292-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | autoconf: check for setitimer()jt/itimer-autoconfJonas 'Sortie' Termansen2014-08-291-0/+6
| * | | | | | | | | autoconf: check for struct itimervalJonas 'Sortie' Termansen2014-08-291-0/+8
| * | | | | | | | | git-compat-util.h: add missing semicolon after struct itimervalJonas 'Sortie' Termansen2014-08-291-1/+1
* | | | | | | | | | Merge branch 'jc/test-lazy-prereq'Junio C Hamano2014-09-292-4/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tests: drop GIT_*_TIMING_TESTS environment variable supportjc/test-lazy-prereqJunio C Hamano2014-06-132-4/+0
* | | | | | | | | | | Merge branch 'sb/merge-recursive-copy-paste-fix'Junio C Hamano2014-09-291-5/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: remove stale commented debugging codesb/merge-recursive-copy-paste-fixStefan Beller2014-09-231-4/+0
| * | | | | | | | | | | merge-recursive: fix copy-paste mistakeStefan Beller2014-09-231-1/+1
* | | | | | | | | | | | Merge branch 'pr/use-default-sigpipe-setting'Junio C Hamano2014-09-293-1/+50
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | mingw.h: add dummy functions for sigset_t operationspr/use-default-sigpipe-settingJohannes Sixt2014-09-222-3/+8
| * | | | | | | | | | | | unblock and unignore SIGPIPEPatrick Reynolds2014-09-182-0/+44
* | | | | | | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-09-291-0/+12
* | | | | | | | | | | | | Merge branch 'jk/mbox-from-line'Junio C Hamano2014-09-296-1/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mailinfo: work around -Wstring-plus-int warningjk/mbox-from-lineEric Sunshine2014-09-221-1/+2
| * | | | | | | | | | | | | mailinfo: make ">From" in-body header check more robustJeff King2014-09-166-1/+65
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'sb/t6031-typofix'Junio C Hamano2014-09-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t6031-test-merge-recursive: do not forget to add file to be committedsb/t6031-typofixStefan Beller2014-09-221-0/+1
* | | | | | | | | | | | | | Merge branch 'sb/t9300-typofix'Junio C Hamano2014-09-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t9300-fast-import: fix typo in test descriptionsb/t9300-typofixStefan Beller2014-09-221-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'rs/remote-simplify'Junio C Hamano2014-09-291-12/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote: simplify match_name_with_pattern() using strbufrs/remote-simplifyRené Scharfe2014-09-221-12/+5
* | | | | | | | | | | | | | | Merge branch 'rs/graph-simplify'Junio C Hamano2014-09-291-13/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | graph: simplify graph_padding_line()rs/graph-simplifyRené Scharfe2014-09-221-13/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'da/rev-parse-verify-quiet'Junio C Hamano2014-09-298-27/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | stash: prefer --quiet over shell redirection of the standard error streamda/rev-parse-verify-quietDavid Aguilar2014-09-191-6/+7
| * | | | | | | | | | | | | | | refs: make rev-parse --quiet actually quietDavid Aguilar2014-09-196-16/+58
| * | | | | | | | | | | | | | | t1503: use test_must_be_emptyDavid Aguilar2014-09-161-5/+5
| * | | | | | | | | | | | | | | Documentation: a note about stdout for git rev-parse --verify --quietDavid Aguilar2014-09-151-0/+1
* | | | | | | | | | | | | | | | Merge branch 'hj/pretty-naked-decoration'Junio C Hamano2014-09-295-11/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pretty: add %D format specifierhj/pretty-naked-decorationHarry Jeffery2014-09-185-11/+35
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2014-09-282-50/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2014-09-282-50/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | l10n: de.po: use comma before "um"Phillip Sz2014-09-251-43/+43
| | * | | | | | | | | | | | | | | l10n: de.po: change Email to E-MailPhillip Sz2014-09-251-7/+7
| | * | | | | | | | | | | | | | | po/TEAMS: add new member to German translation teamRalf Thielow2014-09-251-0/+1
| | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-09-261-0/+21
* | | | | | | | | | | | | | | | Merge branch 'sb/help-unknown-command-sort-fix'Junio C Hamano2014-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | help: fix the size passed to qsortsb/help-unknown-command-sort-fixStefan Beller2014-09-181-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'jk/branch-verbose-merged'Junio C Hamano2014-09-262-14/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \