summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
AgeCommit message (Expand)Author
2013-05-13rebase --merge: return control to caller, for housekeepingRamkumar Ramachandra
2012-06-26rebase: don't source git-sh-setup twiceMartin von Zweigbergk
2012-02-27rebase -m: only call "notes copy" when rewritten exists and is non-emptyAndrew Wong
2011-02-10rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk
2011-02-10rebase: extract code for writing basic stateMartin von Zweigbergk
2011-02-10rebase: extract merge code to new source fileMartin von Zweigbergk