summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-031-1/+1
|\
| * remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-241-1/+1
* | Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maintJunio C Hamano2013-04-261-1/+4
|\ \
| * | receive-pack: close sideband fd on early pack errorsJeff King2013-04-191-1/+4
* | | Merge branch 'jk/chopped-ident' into maintJunio C Hamano2013-04-262-74/+8
|\ \ \
| * | | blame: handle broken commit headers gracefullyRené Scharfe2013-04-171-3/+8
| * | | cat-file: print tags raw for "cat-file -p"Jeff King2013-04-171-71/+0
* | | | Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2013-04-261-7/+11
|\ \ \ \
| * | | | fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow2013-04-071-4/+8
| * | | | fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2013-04-071-3/+3
* | | | | Merge branch 'jc/merge-tag-object' into maintJunio C Hamano2013-04-241-0/+13
|\ \ \ \ \
| * | | | | merge: a random object may not necssarily be a commitJunio C Hamano2013-03-191-0/+13
* | | | | | cherry-pick/revert: make usage say '<commit-ish>...'Kevin Bracey2013-04-241-2/+2
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano2013-04-221-9/+8
|\ \ \ \ \
| * | | | | show-branch: use strbuf instead of static bufferJeff King2013-04-061-9/+8
| |/ / / /
* | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano2013-04-221-6/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-221-6/+10
| |/ / /
* | | | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-3/+3
* | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-04-121-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | fast-export: fix argument name in error messagesPaul Price2013-04-121-2/+2
* | | | Merge branch 'nd/index-pack-threaded-fixes' into maintJunio C Hamano2013-04-041-8/+26
|\ \ \ \
| * | | | index-pack: guard nr_resolved_deltas reads by lockThomas Rast2013-03-191-1/+3
| * | | | index-pack: protect deepest_delta in multithread codeNguyễn Thái Ngọc Duy2013-03-191-7/+23
* | | | | Merge branch 'jk/index-pack-correct-depth-fix' into maintJunio C Hamano2013-04-041-0/+2
|\ \ \ \ \
| * | | | | index-pack: always zero-initialize object_entry listJeff King2013-03-201-0/+2
| |/ / / /
* | | | | Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-032-2/+2
|\ \ \ \ \
| * | | | | gpg_interface: allow to request status returnMichael J Gruber2013-02-142-2/+2
* | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano2013-04-031-1/+3
|\ \ \ \ \ \
| * | | | | | git-commit: only append a newline to -m mesg if necessaryBrandon Casey2013-02-191-1/+3
* | | | | | | Merge branch 'jc/describe' into maintJunio C Hamano2013-04-031-21/+20
|\ \ \ \ \ \ \
| * | | | | | | describe: --match=<pattern> must limit the refs even when used with --allJunio C Hamano2013-02-281-21/+20
* | | | | | | | Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2013-04-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | tag: --force does not have to warn when creating tagsPhil Hord2013-03-131-1/+1
| |/ / / / / / /
* | | | | | | | Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-032-6/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-032-6/+2
| |\ \ \ \ \ \ \
| | * | | | | | | use parse_object_or_die instead of die("bad object")Jeff King2013-03-172-6/+2
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano2013-04-031-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano2013-04-031-4/+5
| |\ \ \ \ \ \ \ \
* | | | | | | | | | cat-file: Fix an gcc -Wuninitialized warningRamsay Jones2013-03-291-1/+1
* | | | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/mailsplit-maildir-muttsort' into maintJunio C Hamano2013-03-261-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mailsplit: sort maildir filenames more cleverlyJeff King2013-03-021-0/+23
* | | | | | | | | | Merge branch 'nd/branch-error-cases' into maintJunio C Hamano2013-03-261-0/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: segfault fixes and validationNguyễn Thái Ngọc Duy2013-02-231-0/+27
* | | | | | | | | | | Merge branch 'ap/maint-update-index-h-is-for-help' into maintJunio C Hamano2013-03-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | update-index: allow "-h" to also display optionsAntoine Pelisse2013-02-231-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/index-pack-l10n-buf-overflow' into maintJunio C Hamano2013-03-261-4/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | index-pack: fix buffer overflow caused by translationsNguyễn Thái Ngọc Duy2013-03-161-4/+5
* | | | | | | | | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano2013-03-261-2/+2
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status