summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Sync with 'maint'Junio C Hamano2013-04-122-5/+5
|\
| * 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
| |\ \
| * \ \ Merge branch 'jk/index-pack-correct-depth-fix' into maintJunio C Hamano2013-04-041-0/+2
| |\ \ \
* | \ \ \ Merge branch 'po/help-guides'Junio C Hamano2013-04-111-2/+44
|\ \ \ \ \
| * | | | | builtin/help.c: add list_common_guides_help() functionPhilip Oakley2013-04-021-3/+33
| * | | | | builtin/help.c: add --guide optionPhilip Oakley2013-04-021-2/+8
| * | | | | builtin/help.c: split "-a" processing into twoPhilip Oakley2013-04-021-1/+7
* | | | | | Merge branch 'jk/rm-removed-paths'Junio C Hamano2013-04-071-1/+1
|\ \ \ \ \ \
| * | | | | | rm: do not complain about d/f conflicts during deletionJeff King2013-04-041-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-032-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano2013-04-031-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/describe' into maintJunio C Hamano2013-04-031-21/+20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2013-04-031-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
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/triangle'Junio C Hamano2013-04-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | remote.c: introduce a way to have different remotes for fetch/pushRamkumar Ramachandra2013-04-021-1/+1
* | | | | | | | | | | | | | fast-export: Allow pruned-references in mark fileAntoine Pelisse2013-04-071-4/+7
* | | | | | | | | | | | | | Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-051-1/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-311-0/+3
| * | | | | | | | | | | | | | merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-311-1/+33
* | | | | | | | | | | | | | | Merge branch 'jc/merge-tag-object'Junio C Hamano2013-04-051-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | merge: a random object may not necssarily be a commitJunio C Hamano2013-03-191-0/+13
* | | | | | | | | | | | | | | | Merge branch 'jm/branch-rename-nothing-error'Junio C Hamano2013-04-031-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | branch: give better message when no names specified for renameJonathon Mah2013-03-311-1/+3
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-031-2/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | clone: leave repo in place after checkout errorsJeff King2013-03-291-1/+24
| * | | | | | | | | | | | | | | | clone: run check_everything_connectedJeff King2013-03-271-0/+26
| * | | | | | | | | | | | | | | | clone: die on errors from unpack_treesJeff King2013-03-271-1/+2
* | | | | | | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent'Junio C Hamano2013-04-031-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-221-6/+10
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'Junio C Hamano2013-04-031-7/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy2013-03-271-7/+36
* | | | | | | | | | | | | | | | | Merge branch 'js/log-gpg'Junio C Hamano2013-04-021-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | log: read gpg settings for signed commit verificationJacob Sarvis2013-03-271-0/+3
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'bk/document-commit-tree-S'Junio C Hamano2013-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | commit-tree: document -S option consistentlyBrad King2013-03-251-1/+1
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/index-pack-threaded-fixes'Junio C Hamano2013-04-011-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'Junio C Hamano2013-04-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | index-pack: always zero-initialize object_entry listJeff King2013-03-201-0/+2
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'nd/branch-show-rebase-bisect-state'Junio C Hamano2013-04-011-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | status, branch: fix the misleading "bisecting" messageNguyễn Thái Ngọc Duy2013-03-231-1/+1
| * | | | | | | | | | | | | | | branch: show more information when HEAD is detachedNguyễn Thái Ngọc Duy2013-03-161-1/+25