summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
Commit message (Expand)AuthorAgeFilesLines
* remove #!interpreter line from shell librariesjn/scripts-updatesJonathan Nieder2013-11-261-1/+3
* rebase --merge: return control to caller, for housekeepingRamkumar Ramachandra2013-05-121-3/+2
* rebase: don't source git-sh-setup twiceMartin von Zweigbergk2012-06-261-2/+0
* rebase -m: only call "notes copy" when rewritten exists and is non-emptyAndrew Wong2012-02-261-4/+7
* rebase -m: don't print exit code 2 when merge failsMartin von Zweigbergk2011-02-101-1/+1
* rebase: extract code for writing basic stateMartin von Zweigbergk2011-02-101-4/+1
* rebase: extract merge code to new source fileMartin von Zweigbergk2011-02-101-0/+154