Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | commit: do not lose mergetag header when not amending | Junio C Hamano | 2011-12-20 | 1 | -1/+5 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jc/checkout-m-twoway' | Junio C Hamano | 2011-12-19 | 1 | -24/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | checkout_merged(): squelch false warning from some gcc | Junio C Hamano | 2011-12-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | checkout -m: no need to insist on having all 3 stages | Junio C Hamano | 2011-12-06 | 1 | -24/+36 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/fetch-no-tail-match-refs' | Junio C Hamano | 2011-12-19 | 2 | -7/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | fetch-pack: match refs exactly | Jeff King | 2011-12-13 | 1 | -4/+9 | |
| * | | | | | | | | | | | | | | | | drop "match" parameter from get_remote_heads | Jeff King | 2011-12-13 | 2 | -3/+2 | |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-19 | 14 | -50/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Rename resolve_ref() to resolve_ref_unsafe()nd/resolve-ref | Nguyễn Thái Ngọc Duy | 2011-12-13 | 8 | -9/+9 | |
| * | | | | | | | | | | | | | | | | | Convert resolve_ref+xstrdup to new resolve_refdup function | Nguyễn Thái Ngọc Duy | 2011-12-13 | 8 | -40/+31 | |
| * | | | | | | | | | | | | | | | | | revert: convert resolve_ref() to read_ref_full() | Nguyễn Thái Ngọc Duy | 2011-12-12 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-sequencer-fixes' | Junio C Hamano | 2011-12-19 | 1 | -48/+92 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | revert: stop creating and removing sequencer-old directoryjn/maint-sequencer-fixes | Jonathan Nieder | 2011-12-12 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | revert: do not remove state until sequence is finished | Jonathan Nieder | 2011-12-12 | 1 | -11/+1 | |
| * | | | | | | | | | | | | | | | | revert: allow single-pick in the middle of cherry-pick sequence | Jonathan Nieder | 2011-12-12 | 1 | -0/+26 | |
| * | | | | | | | | | | | | | | | | revert: pass around rev-list args in already-parsed form | Jonathan Nieder | 2011-12-12 | 1 | -24/+29 | |
| * | | | | | | | | | | | | | | | | revert: allow cherry-pick --continue to commit before resuming | Jonathan Nieder | 2011-12-12 | 1 | -3/+20 | |
| * | | | | | | | | | | | | | | | | revert: give --continue handling its own function | Jonathan Nieder | 2011-12-12 | 1 | -11/+17 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-mv' | Junio C Hamano | 2011-12-19 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | mv: be quiet about overwritingjk/maint-mv | Jeff King | 2011-12-12 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | mv: improve overwrite warning | Jeff King | 2011-12-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | mv: make non-directory destination error more clear | Jeff King | 2011-12-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | mv: honor --verbose flag | Jeff King | 2011-12-12 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | Merge branch 'ci/stripspace-docs' | Junio C Hamano | 2011-12-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Update documentation for stripspaceci/stripspace-docs | Conrad Irwin | 2011-12-12 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'tr/cache-tree' | Junio C Hamano | 2011-12-19 | 2 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | reset: update cache-tree data when appropriate | Thomas Rast | 2011-12-06 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | commit: write cache-tree data when writing index anyway | Thomas Rast | 2011-12-06 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | Refactor cache_tree_update idiom from commit | Thomas Rast | 2011-12-06 | 1 | -4/+1 | |
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jc/commit-amend-no-edit' | Junio C Hamano | 2011-12-16 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | commit: honour --no-edit | Junio C Hamano | 2011-12-08 | 1 | -4/+5 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jc/stream-to-pack' | Junio C Hamano | 2011-12-16 | 2 | -44/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | bulk-checkin: replace fast-import based implementationjc/stream-to-pack | Junio C Hamano | 2011-12-01 | 2 | -5/+6 | |
| * | | | | | | | | | | | | | | | finish_tmp_packfile(): a helper function | Junio C Hamano | 2011-10-28 | 1 | -23/+10 | |
| * | | | | | | | | | | | | | | | create_tmp_packfile(): a helper function | Junio C Hamano | 2011-10-28 | 1 | -9/+3 | |
| * | | | | | | | | | | | | | | | write_pack_header(): a helper function | Junio C Hamano | 2011-10-28 | 1 | -6/+3 | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/upload-archive-use-start-command' | Junio C Hamano | 2011-12-16 | 1 | -31/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | upload-archive: use start_command instead of forkjk/upload-archive-use-start-command | Jeff King | 2011-11-21 | 1 | -31/+12 | |
* | | | | | | | | | | | | | | | | | Merge branch 'ks/tag-cleanup' | Junio C Hamano | 2011-12-13 | 1 | -14/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | git-tag: introduce --cleanup optionks/tag-cleanup | Kirill A. Shutemov | 2011-12-09 | 1 | -14/+53 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'bc/maint-apply-check-no-patch' | Junio C Hamano | 2011-12-13 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patch | Brandon Casey | 2011-12-05 | 1 | -5/+5 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/ignore-might-be-precious' | Junio C Hamano | 2011-12-13 | 2 | -7/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignorend/ignore-might-be-precious | Nguyễn Thái Ngọc Duy | 2011-11-28 | 2 | -7/+16 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious | Junio C Hamano | 2011-11-28 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/branch-move-to-self' | Junio C Hamano | 2011-12-13 | 2 | -6/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-self | Jonathan Nieder | 2011-11-28 | 2 | -5/+12 | |
| * | | | | | | | | | | | | | | | | | | | branch: allow a no-op "branch -M <current-branch> HEAD" | Jonathan Nieder | 2011-11-28 | 1 | -1/+8 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-12-13 | 2 | -39/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle' into maint | Junio C Hamano | 2011-12-13 | 1 | -12/+43 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |