aboutsummaryrefslogtreecommitdiffstats
path: root/git-rebase--merge.sh
AgeCommit message (Expand)AuthorFilesLines
2011-02-10rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk1-1/+1
2011-02-10rebase: extract code for writing basic stateMartin von Zweigbergk1-4/+1
2011-02-10rebase: extract merge code to new source fileMartin von Zweigbergk1-0/+154