summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
AgeCommit message (Expand)AuthorFilesLines
2014-07-02Merge branch 'bc/fix-rebase-merge-skip'Libravatar Junio C Hamano1-2/+3
2014-06-16rebase--merge: fix --skip with two conflicts in a rowLibravatar brian m. carlson1-2/+3
2014-06-03Merge branch 'ep/shell-command-substitution'Libravatar Junio C Hamano1-2/+2
2014-04-23git-rebase--merge.sh: use the $( ... ) construct for command substitutionLibravatar Elia Pinto1-2/+2
2014-04-21Merge branch 'km/avoid-non-function-return-in-rebase'Libravatar Junio C Hamano1-0/+15
2014-04-17rebase: avoid non-function use of "return" on FreeBSDLibravatar Kyle J. McKay1-0/+15
2014-02-11rebase: add the --gpg-sign optionLibravatar Nicolas Vigier1-1/+1
2013-11-26remove #!interpreter line from shell librariesLibravatar Jonathan Nieder1-1/+3
2013-05-12rebase --merge: return control to caller, for housekeepingLibravatar Ramkumar Ramachandra1-3/+2
2012-06-26rebase: don't source git-sh-setup twiceLibravatar Martin von Zweigbergk1-2/+0
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