aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
Commit message (Expand)AuthorAge
* Merge branch 'bc/fix-rebase-merge-skip' into maintJunio C Hamano2014-07-16
|\
| * rebase--merge: fix --skip with two conflicts in a rowbrian m. carlson2014-06-16
* | Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-21
|\ \ | |/
| * rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay2014-04-17
* | rebase: add the --gpg-sign optionNicolas Vigier2014-02-11
|/
* remove #!interpreter line from shell librariesJonathan Nieder2013-11-26
* rebase --merge: return control to caller, for housekeepingRamkumar Ramachandra2013-05-12
* rebase: don't source git-sh-setup twiceMartin von Zweigbergk2012-06-26
* rebase -m: only call "notes copy" when rewritten exists and is non-emptyAndrew Wong2012-02-26
* rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk2011-02-10
* rebase: extract code for writing basic stateMartin von Zweigbergk2011-02-10
* rebase: extract merge code to new source fileMartin von Zweigbergk2011-02-10