aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
Commit message (Expand)AuthorAge
* 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