Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pw/sequence-rerere-autoupdate' | Junio C Hamano | 2017-08-22 | 1 | -1/+19 |
|\ | |||||
| * | cherry-pick/revert: remember --rerere-autoupdate | Phillip Wood | 2017-08-03 | 1 | -1/+9 |
| * | rebase -i: honor --rerere-autoupdate | Phillip Wood | 2017-08-03 | 1 | -0/+10 |
* | | sha1_name: convert get_sha1* to get_oid* | brian m. carlson | 2017-07-17 | 1 | -3/+3 |
* | | sequencer: convert to struct object_id | brian m. carlson | 2017-07-17 | 1 | -29/+30 |
|/ | |||||
* | Merge branch 'pw/rebase-i-regression-fix-tests' | Junio C Hamano | 2017-06-30 | 1 | -5/+6 |
|\ | |||||
| * | sequencer: print autostash messages to stderr | Johannes Schindelin | 2017-06-19 | 1 | -5/+6 |
* | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 1 | -2/+1 |
|\ \ | |||||
| * | | coccinelle: make use of the "type" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -2/+1 |
* | | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
* | | | | Merge branch 'bw/object-id' | Junio C Hamano | 2017-06-19 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | diff-tree: convert diff_tree_sha1 to struct object_id | Brandon Williams | 2017-06-05 | 1 | -2/+2 |
* | | | | Merge branch 'nd/fopen-errors' | Junio C Hamano | 2017-06-13 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | wrapper.c: add and use fopen_or_warn() | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -4/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ab/c-translators-comment-style' | Junio C Hamano | 2017-06-04 | 1 | -1/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | C style: use standard style for "TRANSLATORS" comments | Ævar Arnfjörð Bjarmason | 2017-05-31 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge branch 'pw/rebase-i-regression-fix' | Junio C Hamano | 2017-05-29 | 1 | -1/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | rebase -i: add missing newline to end of message | Phillip Wood | 2017-05-20 | 1 | -1/+1 |
| * | | rebase -i: silence stash apply | Phillip Wood | 2017-05-20 | 1 | -0/+2 |
| * | | rebase -i: fix reflog message | Phillip Wood | 2017-05-20 | 1 | -0/+1 |
* | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-05-29 | 1 | -29/+30 |
|\ \ \ | |||||
| * | | | tree: convert parse_tree_indirect to struct object_id | brian m. carlson | 2017-05-08 | 1 | -1/+1 |
| * | | | sequencer: convert do_recursive_merge to struct object_id | brian m. carlson | 2017-05-08 | 1 | -3/+3 |
| * | | | merge: convert checkout_fast_forward to struct object_id | brian m. carlson | 2017-05-08 | 1 | -1/+1 |
| * | | | sequencer: convert fast_forward_to to struct object_id | brian m. carlson | 2017-05-08 | 1 | -11/+11 |
| * | | | Convert lookup_tree to struct object_id | brian m. carlson | 2017-05-08 | 1 | -1/+1 |
| * | | | Convert lookup_commit* to struct object_id | brian m. carlson | 2017-05-08 | 1 | -4/+4 |
| * | | | Convert remaining callers of lookup_commit_reference* to object_id | brian m. carlson | 2017-05-08 | 1 | -10/+10 |
| * | | | sequencer: convert some functions to struct object_id | brian m. carlson | 2017-05-08 | 1 | -6/+6 |
| * | | | Convert struct cache_tree to use struct object_id | brian m. carlson | 2017-05-02 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'jt/use-trailer-api-in-commands' | Junio C Hamano | 2017-05-16 | 1 | -7/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | sequencer: add newline before adding footers | Jonathan Tan | 2017-04-27 | 1 | -7/+4 |
* | | | Merge branch 'sh/rebase-i-reread-todo-after-exec' | Junio C Hamano | 2017-05-01 | 1 | -0/+22 |
|\ \ \ | |||||
| * | | | rebase -i: reread the todo list if `exec` touched it | Stephen Hicks | 2017-04-27 | 1 | -0/+22 |
* | | | | Merge branch 'jk/war-on-git-path' | Junio C Hamano | 2017-04-26 | 1 | -6/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | use git_path_* helper functions | Jeff King | 2017-04-21 | 1 | -6/+6 |
* | | | | Merge branch 'js/rebase-i-reword-to-run-hooks' | Junio C Hamano | 2017-03-30 | 1 | -23/+31 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | sequencer: allow the commit-msg hooks to run during a `reword` | Johannes Schindelin | 2017-03-27 | 1 | -2/+6 |
| * | | | sequencer: make commit options more extensible | Johannes Schindelin | 2017-03-27 | 1 | -22/+26 |
* | | | | sequencer: fix missing newline | Brandon Williams | 2017-03-23 | 1 | -1/+1 |
|/ / / | |||||
* / / | sequencer: drop "warning:" when stopping for edit | Jeff King | 2017-03-17 | 1 | -1/+2 |
|/ / | |||||
* | | sequencer (rebase -i): write out the final message | Johannes Schindelin | 2017-01-17 | 1 | -0/+3 |
* | | sequencer (rebase -i): write the progress into files | Johannes Schindelin | 2017-01-17 | 1 | -3/+27 |
* | | sequencer (rebase -i): show the progress | Johannes Schindelin | 2017-01-17 | 1 | -0/+32 |
* | | sequencer (rebase -i): suggest --edit-todo upon unknown command | Johannes Schindelin | 2017-01-17 | 1 | -1/+5 |
* | | sequencer (rebase -i): show only failed cherry-picks' output | Johannes Schindelin | 2017-01-17 | 1 | -0/+4 |
* | | sequencer (rebase -i): show only failed `git commit`'s output | Johannes Schindelin | 2017-01-17 | 1 | -0/+18 |
* | | sequencer: use run_command() directly | Johannes Schindelin | 2017-01-17 | 1 | -20/+16 |
* | | sequencer: update reading author-script | Johannes Schindelin | 2017-01-17 | 1 | -22/+12 |