Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'pw/rebase-i-author-script-fix' | Junio C Hamano | 2018-09-04 | 1 | -9/+38 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | sequencer: fix quoting in write_author_script | Phillip Wood | 2018-08-07 | 1 | -7/+29 | |
| * | | | | sequencer: handle errors from read_author_ident() | Phillip Wood | 2018-08-07 | 1 | -2/+9 | |
* | | | | | i18n: fix mistakes in translated strings | Jean-Noël Avila | 2018-08-23 | 1 | -1/+1 | |
* | | | | | Merge branch 'pw/rebase-i-merge-segv-fix' | Junio C Hamano | 2018-08-20 | 1 | -5/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | rebase -i: fix SIGSEGV when 'merge <branch>' fails | Phillip Wood | 2018-08-16 | 1 | -5/+19 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge branch 'pw/rebase-i-squash-number-fix' | Junio C Hamano | 2018-08-20 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | rebase -i: fix numbering in squash message | Phillip Wood | 2018-08-15 | 1 | -2/+2 | |
* | | | | | | Merge branch 'nd/no-the-index' | Junio C Hamano | 2018-08-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | cache-tree: wrap the_index based wrappers with #ifdef | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -2/+2 | |
* | | | | | | | Merge branch 'js/rebase-merges-exec-fix' | Junio C Hamano | 2018-08-20 | 1 | -11/+31 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | rebase --exec: make it work with --rebase-merges | Johannes Schindelin | 2018-08-09 | 1 | -11/+31 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'es/rebase-i-author-script-fix' | Junio C Hamano | 2018-08-17 | 1 | -15/+24 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | sequencer: don't die() on bogus user-edited timestamp | Eric Sunshine | 2018-07-31 | 1 | -0/+9 | |
| * | | | | | | sequencer: fix "rebase -i --root" corrupting author header timestamp | Eric Sunshine | 2018-07-31 | 1 | -14/+9 | |
| * | | | | | | sequencer: fix "rebase -i --root" corrupting author header timezone | Eric Sunshine | 2018-07-31 | 1 | -1/+6 | |
| * | | | | | | sequencer: fix "rebase -i --root" corrupting author header | Eric Sunshine | 2018-07-31 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge branch 'nd/i18n' | Junio C Hamano | 2018-08-15 | 1 | -13/+15 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | sequencer.c: mark more strings for translation | Nguyễn Thái Ngọc Duy | 2018-07-23 | 1 | -12/+14 | |
| * | | | | | Update messages in preparation for i18n | Nguyễn Thái Ngọc Duy | 2018-07-23 | 1 | -4/+4 | |
* | | | | | | Merge branch 'bc/sequencer-export-work-tree-as-well' | Junio C Hamano | 2018-08-02 | 1 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | sequencer: pass absolute GIT_WORK_TREE to exec commands | brian m. carlson | 2018-07-16 | 1 | -0/+2 | |
* | | | | | | | Merge branch 'js/rebase-merge-octopus' | Junio C Hamano | 2018-08-02 | 1 | -43/+125 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | rebase --rebase-merges: add support for octopus merges | Johannes Schindelin | 2018-07-11 | 1 | -43/+125 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'sb/object-store-lookup' | Junio C Hamano | 2018-08-02 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | commit: add repository argument to lookup_commit | Stefan Beller | 2018-06-29 | 1 | -2/+2 | |
| * | | | | | | commit: add repository argument to lookup_commit_reference | Stefan Beller | 2018-06-29 | 1 | -3/+3 | |
| * | | | | | | commit: add repository argument to lookup_commit_reference_gently | Stefan Beller | 2018-06-29 | 1 | -1/+1 | |
| * | | | | | | tree: add repository argument to lookup_tree | Stefan Beller | 2018-06-29 | 1 | -1/+1 | |
| * | | | | | | Merge branch 'sb/object-store-grafts' into sb/object-store-lookup | Junio C Hamano | 2018-06-29 | 1 | -25/+27 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'as/sequencer-customizable-comment-char' | Junio C Hamano | 2018-07-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | sequencer: use configured comment character | Aaron Schrab | 2018-07-16 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'jk/empty-pick-fix' | Junio C Hamano | 2018-07-24 | 1 | -4/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | sequencer: don't say BUG on bogus input | Jeff King | 2018-07-11 | 1 | -2/+4 | |
| * | | | | | | | sequencer: handle empty-set cases consistently | Jeff King | 2018-07-11 | 1 | -2/+4 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'bb/pedantic' | Junio C Hamano | 2018-07-24 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | sequencer.c: avoid empty statements at top level | Beat Bolli | 2018-07-09 | 1 | -2/+2 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge branch 'en/rebase-i-microfixes' | Junio C Hamano | 2018-07-18 | 1 | -1/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix use of strategy options with interactive rebases | Elijah Newren | 2018-06-27 | 1 | -1/+6 | |
* | | | | | | | Merge branch 'pw/rebase-i-keep-reword-after-conflict' | Junio C Hamano | 2018-07-18 | 1 | -3/+20 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | sequencer: do not squash 'reword' commits when we hit conflicts | Phillip Wood | 2018-06-19 | 1 | -3/+20 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 2018-07-18 | 1 | -25/+27 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | path.c: migrate global git_path_* to take a repository argument | Stefan Beller | 2018-05-18 | 1 | -18/+19 | |
| * | | | | | object-store: move object access functions to object-store.h | Stefan Beller | 2018-05-16 | 1 | -0/+1 | |
* | | | | | | Merge branch 'sb/plug-misc-leaks' | Junio C Hamano | 2018-06-25 | 1 | -1/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | sequencer.c: plug mem leak in git_sequencer_config | Stefan Beller | 2018-06-25 | 1 | -0/+1 | |
| * | | | | | | sequencer.c: plug leaks in do_pick_commit | Stefan Beller | 2018-06-04 | 1 | -1/+2 | |
* | | | | | | | Merge branch 'nd/commit-util-to-slab' | Junio C Hamano | 2018-06-25 | 1 | -6/+18 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | sequencer.c: use commit-slab to associate todo items to commits | Nguyễn Thái Ngọc Duy | 2018-05-21 | 1 | -3/+9 | |
| * | | | | | | sequencer.c: use commit-slab to mark seen commits | Nguyễn Thái Ngọc Duy | 2018-05-21 | 1 | -3/+9 |