summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meldDavid Aguilar2014-10-162-2/+16
* Merge branch 'maint-2.0' into maintJunio C Hamano2014-10-071-1/+1
|\
| * Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2014-10-071-1/+1
| |\
| | * Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-10-071-1/+1
| | |\
| | | * git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann2014-10-071-1/+1
* | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-076-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
* | | | | 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
|\ \ \ \ \
| * | | | | fsck: return non-zero status on missing ref tipsjk/fsck-exit-code-fixJeff King2014-09-122-1/+58
| * | | | | fsck: exit with non-zero status upon error from fsck_obj()Jeff King2014-09-103-8/+29
| | |_|/ / | |/| | |
* | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-294-7/+41
|\ \ \ \ \
| * | | | | config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fixJeff King2014-09-113-7/+21
| * | | | | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-183-2/+22
| | |_|/ / | |/| | |
* | | | | Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-292-0/+25
|\ \ \ \ \
| * | | | | reachable.c: add HEAD to reachability starting commitsmk/reachable-protect-detached-headMax Kirillov2014-09-032-0/+25
| | |_|/ / | |/| | |
* | | | | Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-292-1/+109
|\ \ \ \ \
| * | | | | fast-import: fix segfault in store_tree()mb/fast-import-delete-rootMaxim Bublis2014-08-292-3/+7
| * | | | | t9300: test filedelete commandMaxim Bublis2014-08-291-0/+104
* | | | | | Merge branch 'jk/index-pack-threading-races' into maintJunio C Hamano2014-09-291-2/+31
|\ \ \ \ \ \
| * | | | | | index-pack: fix race condition with duplicate basesjk/index-pack-threading-racesJeff King2014-08-291-2/+31
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-295-2/+153
|\ \ \ \ \ \
| * | | | | | send-pack: take refspecs over stdinjk/send-pack-many-refspecsJeff King2014-08-265-2/+153
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'so/rebase-doc' into maintJunio C Hamano2014-09-291-6/+3
|\ \ \ \ \ \
| * | | | | | Documentation/git-rebase.txt: <upstream> must be given to specify <branch>so/rebase-docSergey Organov2014-09-161-1/+1
| * | | | | | Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-opSergey Organov2014-08-121-5/+2
| | |_|_|/ / | |/| | | |
* | | | | | 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
| | |_|_|/ / | |/| | | |
* | | | | | Git 2.1.1v2.1.1Junio C Hamano2014-09-194-3/+48
* | | | | | Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maintJunio C Hamano2014-09-191-1/+3
|\ \ \ \ \ \
| * | | | | | upload-pack: keep poll(2)'s timeout to -1et/spell-poll-infinite-with-minus-one-onlyEdward Thomson2014-08-221-1/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maintJunio C Hamano2014-09-191-4/+6
|\ \ \ \ \ \
| * | | | | | fetch: silence git-gc if --quiet is givennd/fetch-pass-quiet-to-gc-child-processNguyễn Thái Ngọc Duy2014-08-181-0/+2
| * | | | | | fetch: convert argv_gc_auto to struct argv_arrayNguyễn Thái Ngọc Duy2014-08-181-4/+4
* | | | | | | Merge branch 'jk/prune-top-level-refs-after-packing' into maintJunio C Hamano2014-09-192-1/+9
|\ \ \ \ \ \ \
| * | | | | | | pack-refs: prune top-level refs like "refs/foo"jk/prune-top-level-refs-after-packingJeff King2014-08-252-1/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/fast-import-fixes' into maintJunio C Hamano2014-09-191-8/+13
|\ \ \ \ \ \ \
| * | | | | | | fast-import: fix buffer overflow in dump_tagsjk/top-level-refs-cleanupjk/fast-import-fixesJeff King2014-08-251-4/+6
| * | | | | | | fast-import: clean up pack_data pointer in end_packfileJeff King2014-08-251-4/+7
| |/ / / / / /
* | | | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano2014-09-192-21/+27
|\ \ \ \ \ \ \
| * | | | | | | checkout -m: attempt merge when deletion of path was stagedjn/unpack-trees-checkout-m-carry-deletionJonathan Nieder2014-08-252-5/+23
| * | | | | | | unpack-trees: use 'cuddled' style for if-else cascadeJonathan Nieder2014-08-131-8/+4
| * | | | | | | unpack-trees: simplify 'all other failures' caseStefan Beller2014-08-131-10/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sp/pack-protocol-doc-on-shallow' into maintJunio C Hamano2014-09-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Document LF appearing in shallow command during send-pack/receive-packsp/pack-protocol-doc-on-shallowShawn Pearce2014-08-281-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/prompt-stash-could-be-packed' into maintJunio C Hamano2014-09-191-1/+2
|\ \ \ \ \ \ \
| * | | | | | | git-prompt: do not look for refs/stash in $GIT_DIRjk/prompt-stash-could-be-packedJeff King2014-08-251-1/+2
| | |_|/ / / / | |/| | | | |
View Lorry Controller Status