summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase: implement --merge via the interactive machineryElijah Newren2019-01-071-166/+0
* rebase: define linearization ordering and enforce itElijah Newren2018-12-281-1/+1
* am, rebase--merge: do not overlook --skip'ed commits with post-rewriteElijah Newren2018-12-281-0/+2
* Merge branch 'en/rebase-i-microfixes'Junio C Hamano2018-07-181-2/+2
|\
| * git-rebase--merge: modernize "git-$cmd" to "git $cmd"Elijah Newren2018-06-271-2/+2
* | Merge branch 'pw/rebase-signoff'Junio C Hamano2018-04-251-1/+1
|\ \
| * | rebase: extend --signoff supportPhillip Wood2018-03-291-1/+1
* | | rebase: update invocation of rebase dot-sourced scriptsWink Saville2018-03-231-11/+0
| |/ |/|
* | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-0/+5
|\ \
| * | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patchNguyễn Thái Ngọc Duy2018-02-121-1/+3
| * | rebase: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-0/+3
| |/
* | rebase: add --allow-empty-message optiongs/rebase-allow-empty-messageGenki Sky2018-02-071-1/+2
|/
* Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'Junio C Hamano2016-06-271-2/+2
|\
| * rebase: update comment about FreeBSD /bin/shem/newer-freebsd-shells-are-fine-with-returnsEd Maste2016-06-171-2/+2
* | git-rebase--merge: don't include absent parent as a basebw/rebase-merge-entire-branchBen Woosley2016-04-241-1/+3
* | *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy2014-12-011-4/+2
|/
* Merge branch 'bc/fix-rebase-merge-skip'Junio C Hamano2014-07-021-2/+3
|\
| * rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skipbrian m. carlson2014-06-161-2/+3
* | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-06-031-2/+2
|\ \
| * | git-rebase--merge.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-2/+2
* | | Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-211-0/+15
|\ \ \ | |/ / |/| / | |/
| * rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay2014-04-171-0/+15
* | rebase: add the --gpg-sign optionNicolas Vigier2014-02-111-1/+1
|/
* remove #!interpreter line from shell librariesjn/scripts-updatesJonathan Nieder2013-11-261-1/+3
* rebase --merge: return control to caller, for housekeepingRamkumar Ramachandra2013-05-121-3/+2
* rebase: don't source git-sh-setup twiceMartin von Zweigbergk2012-06-261-2/+0
* rebase -m: only call "notes copy" when rewritten exists and is non-emptyAndrew Wong2012-02-261-4/+7
* rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk2011-02-101-1/+1
* rebase: extract code for writing basic stateMartin von Zweigbergk2011-02-101-4/+1
* rebase: extract merge code to new source fileMartin von Zweigbergk2011-02-101-0/+154