summaryrefslogtreecommitdiffstats
path: root/git-rebase--merge.sh
AgeCommit message (Expand)AuthorLines
2019-01-07rebase: implement --merge via the interactive machineryElijah Newren-166/+0
2018-12-28rebase: define linearization ordering and enforce itElijah Newren-1/+1
2018-12-28am, rebase--merge: do not overlook --skip'ed commits with post-rewriteElijah Newren-0/+2
2018-07-18Merge branch 'en/rebase-i-microfixes'Junio C Hamano-2/+2
2018-06-27git-rebase--merge: modernize "git-$cmd" to "git $cmd"Elijah Newren-2/+2
2018-04-25Merge branch 'pw/rebase-signoff'Junio C Hamano-1/+1
2018-03-29rebase: extend --signoff supportPhillip Wood-1/+1
2018-03-23rebase: update invocation of rebase dot-sourced scriptsWink Saville-11/+0
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano-0/+5
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy-1/+3
2018-02-12rebase: add --show-current-patchNguyễn Thái Ngọc Duy-0/+3
2018-02-07rebase: add --allow-empty-message optionGenki Sky-1/+2
2016-06-27Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'Junio C Hamano-2/+2
2016-06-17rebase: update comment about FreeBSD /bin/shEd Maste-2/+2
2016-04-24git-rebase--merge: don't include absent parent as a baseBen Woosley-1/+3
2014-12-01*.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy-4/+2
2014-07-02Merge branch 'bc/fix-rebase-merge-skip'Junio C Hamano-2/+3
2014-06-16rebase--merge: fix --skip with two conflicts in a rowbrian m. carlson-2/+3
2014-06-03Merge branch 'ep/shell-command-substitution'Junio C Hamano-2/+2
2014-04-23git-rebase--merge.sh: use the $( ... ) construct for command substitutionElia Pinto-2/+2
2014-04-21Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano-0/+15
2014-04-17rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay-0/+15
2014-02-11rebase: add the --gpg-sign optionNicolas Vigier-1/+1
2013-11-26remove #!interpreter line from shell librariesJonathan Nieder-1/+3
2013-05-12rebase --merge: return control to caller, for housekeepingRamkumar Ramachandra-3/+2
2012-06-26rebase: don't source git-sh-setup twiceMartin von Zweigbergk-2/+0
2012-02-26rebase -m: only call "notes copy" when rewritten exists and is non-emptyAndrew Wong-4/+7
2011-02-10rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk-1/+1
2011-02-10rebase: extract code for writing basic stateMartin von Zweigbergk-4/+1
2011-02-10rebase: extract merge code to new source fileMartin von Zweigbergk-0/+154
generated by cgit v1.2.3 (git 2.46.0) at 2026-07-16 23:32:32 +0000