The seventh batch

Junio C Hamano committed almost 3 years ago

Merge branch 'dd/format-patch-rfc-updates'

Junio C Hamano committed almost 3 years ago

Merge branch 'jk/ci-retire-allow-ref'

Junio C Hamano committed almost 3 years ago

Merge branch 'ws/git-svn-retire-faketerm'

Junio C Hamano committed almost 3 years ago

Merge branch 'jk/unused-post-2.42'

Junio C Hamano committed almost 3 years ago

Merge branch 'tb/multi-cruft-pack'

Junio C Hamano committed almost 3 years ago

grep: reject --no-or

René Scharfe committed almost 3 years ago

completion: commit: complete configured trailer tokens

Philippe Blain committed almost 3 years ago

rebase -i: fix adding failed command to the todo list

Phillip Wood committed almost 3 years ago

rebase --continue: refuse to commit after failed command

Phillip Wood committed almost 3 years ago

rebase: fix rewritten list for failed pick

Phillip Wood committed almost 3 years ago

sequencer: factor out part of pick_commits()

Phillip Wood committed almost 3 years ago

sequencer: use rebase_path_message()

Phillip Wood committed almost 3 years ago

rebase -i: remove patch file after conflict resolution

Phillip Wood committed almost 3 years ago

rebase -i: move unlink() calls

Phillip Wood committed almost 3 years ago

doc/diff-options: fix link to generating patch section

Sergey Organov committed almost 3 years ago

var: avoid a segmentation fault when `HOME` is unset

Johannes Schindelin committed almost 3 years ago

sequencer: fix error message on failure to copy SQUASH_MSG

Oswald Buddenhagen committed almost 3 years ago

grep: use OPT_INTEGER_F for --max-depth

René Scharfe committed almost 3 years ago

name-rev: use OPT_HIDDEN_BOOL for --peel-tag

René Scharfe committed almost 3 years ago