summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | Merge branch 'jk/pkt-line-cleanup'Junio C Hamano2013-04-015-57/+30
|\ \ \ \ \ \ \
| * | | | | | | teach get_remote_heads to read from a memory bufferJeff King2013-02-242-2/+2
| * | | | | | | pkt-line: provide a LARGE_PACKET_MAX static bufferJeff King2013-02-204-20/+15
| * | | | | | | pkt-line: teach packet_read_line to chomp newlinesJeff King2013-02-204-10/+0
| * | | | | | | pkt-line: drop safe_write functionJeff King2013-02-202-2/+2
| * | | | | | | upload-archive: use argv_array to store client argumentsJeff King2013-02-201-21/+14
| * | | | | | | upload-archive: do not copy repo nameJeff King2013-02-201-7/+2
* | | | | | | | Merge branch 'bc/append-signed-off-by'Junio C Hamano2013-04-012-13/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: update append_signoff prototypeNguyễn Thái Ngọc Duy2013-02-121-12/+1
| * | | | | | | | sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey2013-02-121-1/+1
* | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-311-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | cat-file: Fix an gcc -Wuninitialized warningRamsay Jones2013-03-291-1/+1
* | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-271-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
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/branch-error-cases' into maintJunio C Hamano2013-03-261-0/+27
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-update-index-h-is-for-help' into maintJunio C Hamano2013-03-261-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maintJunio C Hamano2013-03-261-4/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano2013-03-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maintJunio C Hamano2013-03-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fully-peeled-packed-ref'Junio C Hamano2013-03-252-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | use parse_object_or_die instead of die("bad object")Jeff King2013-03-172-6/+2
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |