aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2014-11-14
* difftool: add support for --trust-exit-codeDavid Aguilar2014-10-28
* difftool--helper: exit when reading a prompt answer failsJohannes Sixt2014-10-27
* Merge branch 'maint-2.0' into maintJunio C Hamano2014-10-07
|\
| * Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2014-10-07
| |\
| | * Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-10-07
| | |\
| | | * git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann2014-10-07
* | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-07
|\ \ \ \
| * | | | mailinfo: work around -Wstring-plus-int warningEric Sunshine2014-09-22
| * | | | mailinfo: make ">From" in-body header check more robustJeff King2014-09-16
* | | | | Git 2.1.2v2.1.2Junio C Hamano2014-09-29
* | | | | Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-29
|\ \ \ \ \
| * | | | | fsck: return non-zero status on missing ref tipsJeff King2014-09-12
| * | | | | fsck: exit with non-zero status upon error from fsck_obj()Jeff King2014-09-10
| | |_|/ / | |/| | |
* | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-29
|\ \ \ \ \
| * | | | | config: avoid a funny sentinel value "a^"Jeff King2014-09-11
| * | | | | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-18
| | |_|/ / | |/| | |
* | | | | Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-29
|\ \ \ \ \
| * | | | | reachable.c: add HEAD to reachability starting commitsMax Kirillov2014-09-03
| | |_|/ / | |/| | |
* | | | | Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-29
|\ \ \ \ \
| * | | | | fast-import: fix segfault in store_tree()Maxim Bublis2014-08-29
| * | | | | t9300: test filedelete commandMaxim Bublis2014-08-29
* | | | | | Merge branch 'jk/index-pack-threading-races' into maintJunio C Hamano2014-09-29
|\ \ \ \ \ \
| * | | | | | index-pack: fix race condition with duplicate basesJeff King2014-08-29
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-29
|\ \ \ \ \ \
| * | | | | | send-pack: take refspecs over stdinJeff King2014-08-26
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'so/rebase-doc' into maintJunio C Hamano2014-09-29
|\ \ \ \ \ \
| * | | | | | Documentation/git-rebase.txt: <upstream> must be given to specify <branch>Sergey Organov2014-09-16
| * | | | | | Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-opSergey Organov2014-08-12
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2014-09-28
|\ \ \ \ \ \
| * | | | | | l10n: de.po: use comma before "um"Phillip Sz2014-09-25
| * | | | | | l10n: de.po: change Email to E-MailPhillip Sz2014-09-25
| * | | | | | po/TEAMS: add new member to German translation teamRalf Thielow2014-09-25
| | |_|_|/ / | |/| | | |
* | | | | | Git 2.1.1v2.1.1Junio C Hamano2014-09-19
* | | | | | Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maintJunio C Hamano2014-09-19
|\ \ \ \ \ \
| * | | | | | upload-pack: keep poll(2)'s timeout to -1Edward Thomson2014-08-22
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maintJunio C Hamano2014-09-19
|\ \ \ \ \ \
| * | | | | | fetch: silence git-gc if --quiet is givenNguyễn Thái Ngọc Duy2014-08-18
| * | | | | | fetch: convert argv_gc_auto to struct argv_arrayNguyễn Thái Ngọc Duy2014-08-18
* | | | | | | Merge branch 'jk/prune-top-level-refs-after-packing' into maintJunio C Hamano2014-09-19
|\ \ \ \ \ \ \
| * | | | | | | pack-refs: prune top-level refs like "refs/foo"Jeff King2014-08-25
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/fast-import-fixes' into maintJunio C Hamano2014-09-19
|\ \ \ \ \ \ \
| * | | | | | | fast-import: fix buffer overflow in dump_tagsJeff King2014-08-25
| * | | | | | | fast-import: clean up pack_data pointer in end_packfileJeff King2014-08-25
| |/ / / / / /
* | | | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano2014-09-19
|\ \ \ \ \ \ \
| * | | | | | | checkout -m: attempt merge when deletion of path was stagedJonathan Nieder2014-08-25
| * | | | | | | unpack-trees: use 'cuddled' style for if-else cascadeJonathan Nieder2014-08-13
| * | | | | | | unpack-trees: simplify 'all other failures' caseStefan Beller2014-08-13
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sp/pack-protocol-doc-on-shallow' into maintJunio C Hamano2014-09-19
|\ \ \ \ \ \ \
| * | | | | | | Document LF appearing in shallow command during send-pack/receive-packShawn Pearce2014-08-28
| | |_|_|/ / / | |/| | | | |