Junio C Hamano
|
19dd352d03
Merge branch 'jk/unused'
|
4 years ago |
Junio C Hamano
|
84cdeed1cb
Merge branch 'jc/sequencer-stopped-sha-simplify'
|
4 years ago |
Jeff King
|
9dad073d4b
sequencer: handle ignore_footer when parsing trailers
|
4 years ago |
Jeff King
|
20f4b044a6
sequencer: drop repository argument from run_git_commit()
|
4 years ago |
Junio C Hamano
|
0512eabd91
sequencer: stop abbreviating stopped-sha file
|
4 years ago |
Junio C Hamano
|
9c31b19dd0
Merge branch 'pw/rebase-i-more-options'
|
4 years ago |
Junio C Hamano
|
e699684cf6
Merge branch 'hn/refs-pseudorefs'
|
4 years ago |
Han-Wen Nienhuys
|
b8825ef233
sequencer: treat REVERT_HEAD as a pseudo ref
|
5 years ago |
Han-Wen Nienhuys
|
c8e4159efd
sequencer: treat CHERRY_PICK_HEAD as a pseudo ref
|
5 years ago |
Junio C Hamano
|
4499a42d0c
Merge branch 'ak/sequencer-fix-find-uniq-abbrev'
|
5 years ago |
Junio C Hamano
|
6cceea19eb
Merge branch 'en/sequencer-merge-labels'
|
5 years ago |
Phillip Wood
|
a3894aad67
rebase -i: support --ignore-date
|
5 years ago |
Phillip Wood
|
7573cec52c
rebase -i: support --committer-date-is-author-date
|
5 years ago |
Phillip Wood
|
e8cbe2118a
am: stop exporting GIT_COMMITTER_DATE
|
5 years ago |
Elijah Newren
|
7d056deace
sequencer: avoid garbled merge machinery messages due to commit labels
|
5 years ago |
Antti Keränen
|
5da69c0dac
rebase -i: fix possibly wrong onto hash in todo
|
5 years ago |
Jeff King
|
d70a9eb611
strvec: rename struct fields
|
5 years ago |
Jeff King
|
f6d8942b1f
strvec: fix indentation in renamed calls
|
5 years ago |
Jeff King
|
c972bf4cf5
strvec: convert remaining callers away from argv_array name
|
5 years ago |
Jeff King
|
dbbcd44fb4
strvec: rename files from argv-array to strvec
|
5 years ago |
Junio C Hamano
|
a2a0942a16
Merge branch 'js/rebase-autosquash-double-fixup-fix'
|
5 years ago |
Johannes Schindelin
|
02471e7e20
rebase --autosquash: fix a potential segfault
|
5 years ago |
Junio C Hamano
|
bf10200871
Merge branch 'dl/merge-autostash'
|
5 years ago |
Junio C Hamano
|
d6d561db1c
Merge branch 'jt/rebase-allow-duplicate'
|
5 years ago |
Junio C Hamano
|
c7d8f69da5
Merge branch 'en/rebase-no-keep-empty'
|
5 years ago |
Junio C Hamano
|
fc3f6fd7be
Merge branch 'dd/no-gpg-sign'
|
5 years ago |
Junio C Hamano
|
3aa30ccb1c
Merge branch 'en/sequencer-reflog-action'
|
5 years ago |
Junio C Hamano
|
f72e06703b
Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'
|
5 years ago |
Jonathan Tan
|
0fcb4f6b62
rebase --merge: optionally skip upstreamed commits
|
5 years ago |
Elijah Newren
|
b9cbd2958f
rebase: reinstate --no-keep-empty
|
5 years ago |