Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 'maint' | Junio C Hamano | 2013-04-12 | 2 | -5/+5 |
|\ | |||||
| * | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 | 1 | -3/+3 |
| * | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-04-12 | 1 | -2/+2 |
| |\ | |||||
| | * | fast-export: fix argument name in error messages | Paul Price | 2013-04-12 | 1 | -2/+2 |
| * | | Merge branch 'nd/index-pack-threaded-fixes' into maint | Junio C Hamano | 2013-04-04 | 1 | -8/+26 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/index-pack-correct-depth-fix' into maint | Junio C Hamano | 2013-04-04 | 1 | -0/+2 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'po/help-guides' | Junio C Hamano | 2013-04-11 | 1 | -2/+44 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/help.c: add list_common_guides_help() function | Philip Oakley | 2013-04-02 | 1 | -3/+33 |
| * | | | | | builtin/help.c: add --guide option | Philip Oakley | 2013-04-02 | 1 | -2/+8 |
| * | | | | | builtin/help.c: split "-a" processing into two | Philip Oakley | 2013-04-02 | 1 | -1/+7 |
* | | | | | | Merge branch 'jk/rm-removed-paths' | Junio C Hamano | 2013-04-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rm: do not complain about d/f conflicts during deletion | Jeff King | 2013-04-04 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'mg/gpg-interface-using-status' into maint | Junio C Hamano | 2013-04-03 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint | Junio C Hamano | 2013-04-03 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/describe' into maint | Junio C Hamano | 2013-04-03 | 1 | -21/+20 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ph/tag-force-no-warn-on-creation' into maint | Junio C Hamano | 2013-04-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Sync with 1.8.1 maintenance track | Junio C Hamano | 2013-04-03 | 2 | -6/+2 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 2 | -6/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -4/+5 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ | Merge branch 'rr/triangle' | Junio C Hamano | 2013-04-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | remote.c: introduce a way to have different remotes for fetch/push | Ramkumar Ramachandra | 2013-04-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | | fast-export: Allow pruned-references in mark file | Antoine Pelisse | 2013-04-07 | 1 | -4/+7 |
* | | | | | | | | | | | | | | Merge branch 'sg/gpg-sig' | Junio C Hamano | 2013-04-05 | 1 | -1/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | merge/pull Check for untrusted good GPG signatures | Sebastian Götte | 2013-03-31 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | merge/pull: verify GPG signatures of commits being merged | Sebastian Götte | 2013-03-31 | 1 | -1/+33 |
* | | | | | | | | | | | | | | | Merge branch 'jc/merge-tag-object' | Junio C Hamano | 2013-04-05 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | merge: a random object may not necssarily be a commit | Junio C Hamano | 2013-03-19 | 1 | -0/+13 |
* | | | | | | | | | | | | | | | | Merge branch 'jm/branch-rename-nothing-error' | Junio C Hamano | 2013-04-03 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | branch: give better message when no names specified for rename | Jonathon Mah | 2013-03-31 | 1 | -1/+3 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully' | Junio C Hamano | 2013-04-03 | 1 | -2/+52 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | clone: leave repo in place after checkout errors | Jeff King | 2013-03-29 | 1 | -1/+24 |
| * | | | | | | | | | | | | | | | | clone: run check_everything_connected | Jeff King | 2013-03-27 | 1 | -0/+26 |
| * | | | | | | | | | | | | | | | | clone: die on errors from unpack_trees | Jeff King | 2013-03-27 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent' | Junio C Hamano | 2013-04-03 | 1 | -6/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | apply --whitespace=fix: avoid running over the postimage buffer | Junio C Hamano | 2013-03-22 | 1 | -6/+10 |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls' | Junio C Hamano | 2013-04-03 | 1 | -7/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | checkout: avoid unnecessary match_pathspec calls | Nguyễn Thái Ngọc Duy | 2013-03-27 | 1 | -7/+36 |
* | | | | | | | | | | | | | | | | | Merge branch 'js/log-gpg' | Junio C Hamano | 2013-04-02 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | log: read gpg settings for signed commit verification | Jacob Sarvis | 2013-03-27 | 1 | -0/+3 |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'bk/document-commit-tree-S' | Junio C Hamano | 2013-04-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | commit-tree: document -S option consistently | Brad King | 2013-03-25 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'nd/index-pack-threaded-fixes' | Junio C Hamano | 2013-04-01 | 1 | -8/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | index-pack: guard nr_resolved_deltas reads by lock | Thomas Rast | 2013-03-19 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | index-pack: protect deepest_delta in multithread code | Nguyễn Thái Ngọc Duy | 2013-03-19 | 1 | -7/+23 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-correct-depth-fix' | Junio C Hamano | 2013-04-01 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | index-pack: always zero-initialize object_entry list | Jeff King | 2013-03-20 | 1 | -0/+2 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge branch 'nd/branch-show-rebase-bisect-state' | Junio C Hamano | 2013-04-01 | 1 | -1/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | status, branch: fix the misleading "bisecting" message | Nguyễn Thái Ngọc Duy | 2013-03-23 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | branch: show more information when HEAD is detached | Nguyễn Thái Ngọc Duy | 2013-03-16 | 1 | -1/+25 |