summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
AgeCommit message (Expand)AuthorFilesLines
2012-02-26rebase -m: only call "notes copy" when rewritten exists and is non-emptyLibravatar Andrew Wong1-4/+7
2011-02-10rebase -m: don't print exit code 2 when merge failsLibravatar Martin von Zweigbergk1-1/+1
2011-02-10rebase: extract code for writing basic stateLibravatar Martin von Zweigbergk1-4/+1
2011-02-10rebase: extract merge code to new source fileLibravatar Martin von Zweigbergk1-0/+154