| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint | Junio C Hamano | 2017-12-06 | 1 | -1/+2 |
| |\ | |||||
| | * | sequencer: reschedule pick if index can't be locked | Phillip Wood | 2017-11-16 | 1 | -1/+2 |
| * | | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint | Junio C Hamano | 2017-11-21 | 1 | -29/+16 |
| |\ \ | |/ |/| | |||||
| | * | sequencer.c: check return value of close() in rewrite_file() | Simon Ruderich | 2017-11-02 | 1 | -1/+2 |
| | * | sequencer: use O_TRUNC to truncate files | René Scharfe | 2017-11-01 | 1 | -3/+1 |
| | * | sequencer: factor out rewrite_file() | René Scharfe | 2017-11-01 | 1 | -29/+17 |
| * | | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+6 |
| |\ \ | |/ |/| | |||||
| | * | sequencer: pass absolute GIT_DIR to exec commands | Jacob Keller | 2017-11-02 | 1 | -1/+6 |
| * | | Merge branch 'js/rebase-i-final' | Junio C Hamano | 2017-10-18 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | sequencer.c: unify an error message | Ralf Thielow | 2017-10-17 | 1 | -1/+1 |
| * | | | Merge branch 'js/rebase-i-final' | Junio C Hamano | 2017-10-17 | 1 | -2/+2 |
| |\| | | |||||
| | * | | sequencer.c: fix and unify error messages in rearrange_squash() | Ralf Thielow | 2017-10-16 | 1 | -2/+2 |
| * | | | Merge branch 'js/rebase-i-final' | Junio C Hamano | 2017-10-09 | 1 | -1/+1 |
| |\| | | |||||
| | * | | i18n: add a missing space in message | Jean-Noel Avila | 2017-10-09 | 1 | -1/+1 |
| * | | | Merge branch 'rs/cleanup-strbuf-users' | Junio C Hamano | 2017-10-05 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | use strbuf_addstr() for adding strings to strbufs | René Scharfe | 2017-10-02 | 1 | -1/+1 |
| * | | | | Merge branch 'js/rebase-i-final' | Junio C Hamano | 2017-10-03 | 1 | -0/+531 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| | * | | rebase -i: rearrange fixup/squash lines using the rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -0/+196 |
| | * | | rebase -i: skip unnecessary picks using the rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -0/+107 |
| | * | | rebase -i: check for missing commits in the rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -0/+122 |
| | * | | rebase -i: also expand/collapse the SHA-1s via the rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -0/+57 |
| | * | | rebase -i: generate the script via rebase--helper | Johannes Schindelin | 2017-07-28 | 1 | -0/+49 |
| * | | | sequencer: release strbuf after use in save_head() | Rene Scharfe | 2017-09-07 | 1 | -1/+4 |
| * | | | 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 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |