aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/rm-removed-paths'Junio C Hamano2013-04-07
|\
| * rm: do not complain about d/f conflicts during deletionJeff King2013-04-04
| * Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-03
| |\
| * \ Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano2013-04-03
| |\ \
| * \ \ Merge branch 'jc/describe' into maintJunio C Hamano2013-04-03
| |\ \ \
| * \ \ \ Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2013-04-03
| |\ \ \ \
| * \ \ \ \ Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-03
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-03
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano2013-04-03
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano2013-04-03
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge branch 'rr/triangle'Junio C Hamano2013-04-07
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remote.c: introduce a way to have different remotes for fetch/pushRamkumar Ramachandra2013-04-02
* | | | | | | | | | | fast-export: Allow pruned-references in mark fileAntoine Pelisse2013-04-07
* | | | | | | | | | | Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-05
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-31
| * | | | | | | | | | | merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-31
* | | | | | | | | | | | Merge branch 'jc/merge-tag-object'Junio C Hamano2013-04-05
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge: a random object may not necssarily be a commitJunio C Hamano2013-03-19
* | | | | | | | | | | | | Merge branch 'jm/branch-rename-nothing-error'Junio C Hamano2013-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | branch: give better message when no names specified for renameJonathon Mah2013-03-31
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: leave repo in place after checkout errorsJeff King2013-03-29
| * | | | | | | | | | | | | clone: run check_everything_connectedJeff King2013-03-27
| * | | | | | | | | | | | | clone: die on errors from unpack_treesJeff King2013-03-27
* | | | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent'Junio C Hamano2013-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-22
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'Junio C Hamano2013-04-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy2013-03-27
* | | | | | | | | | | | | | | Merge branch 'js/log-gpg'Junio C Hamano2013-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | log: read gpg settings for signed commit verificationJacob Sarvis2013-03-27
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bk/document-commit-tree-S'Junio C Hamano2013-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | commit-tree: document -S option consistentlyBrad King2013-03-25
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'nd/index-pack-threaded-fixes'Junio C Hamano2013-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | index-pack: guard nr_resolved_deltas reads by lockThomas Rast2013-03-19
| * | | | | | | | | | | | | | index-pack: protect deepest_delta in multithread codeNguyễn Thái Ngọc Duy2013-03-19
* | | | | | | | | | | | | | | Merge branch 'jk/index-pack-correct-depth-fix'Junio C Hamano2013-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | index-pack: always zero-initialize object_entry listJeff King2013-03-20
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'nd/branch-show-rebase-bisect-state'Junio C Hamano2013-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | status, branch: fix the misleading "bisecting" messageNguyễn Thái Ngọc Duy2013-03-23
| * | | | | | | | | | | | | | | branch: show more information when HEAD is detachedNguyễn Thái Ngọc Duy2013-03-16
* | | | | | | | | | | | | | | | Merge branch 'jk/pkt-line-cleanup'Junio C Hamano2013-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | teach get_remote_heads to read from a memory bufferJeff King2013-02-24
| * | | | | | | | | | | | | | | | pkt-line: provide a LARGE_PACKET_MAX static bufferJeff King2013-02-20
| * | | | | | | | | | | | | | | | pkt-line: teach packet_read_line to chomp newlinesJeff King2013-02-20
| * | | | | | | | | | | | | | | | pkt-line: drop safe_write functionJeff King2013-02-20
| * | | | | | | | | | | | | | | | upload-archive: use argv_array to store client argumentsJeff King2013-02-20
| * | | | | | | | | | | | | | | | upload-archive: do not copy repo nameJeff King2013-02-20
* | | | | | | | | | | | | | | | | Merge branch 'bc/append-signed-off-by'Junio C Hamano2013-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | format-patch: update append_signoff prototypeNguyễn Thái Ngọc Duy2013-02-12
| * | | | | | | | | | | | | | | | | sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey2013-02-12