| Commit message (Expand) | Author | Age | Files | Lines |
* | *.sh: avoid hardcoding $GIT_DIR/hooks/... | Nguyễn Thái Ngọc Duy | 2014-12-01 | 1 | -4/+2 |
* | Merge branch 'bc/fix-rebase-merge-skip' | Junio C Hamano | 2014-07-02 | 1 | -2/+3 |
|\ |
|
| * | rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skip | brian m. carlson | 2014-06-16 | 1 | -2/+3 |
* | | Merge branch 'ep/shell-command-substitution' | Junio C Hamano | 2014-06-03 | 1 | -2/+2 |
|\ \ |
|
| * | | git-rebase--merge.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-23 | 1 | -2/+2 |
* | | | Merge branch 'km/avoid-non-function-return-in-rebase' | Junio C Hamano | 2014-04-21 | 1 | -0/+15 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | rebase: avoid non-function use of "return" on FreeBSD | Kyle J. McKay | 2014-04-17 | 1 | -0/+15 |
* | | rebase: add the --gpg-sign option | Nicolas Vigier | 2014-02-11 | 1 | -1/+1 |
|/ |
|
* | remove #!interpreter line from shell librariesjn/scripts-updates | Jonathan Nieder | 2013-11-26 | 1 | -1/+3 |
* | rebase --merge: return control to caller, for housekeeping | Ramkumar Ramachandra | 2013-05-12 | 1 | -3/+2 |
* | rebase: don't source git-sh-setup twice | Martin von Zweigbergk | 2012-06-26 | 1 | -2/+0 |
* | rebase -m: only call "notes copy" when rewritten exists and is non-empty | Andrew Wong | 2012-02-26 | 1 | -4/+7 |
* | rebase -m: don't print exit code 2 when merge fails | Martin von Zweigbergk | 2011-02-10 | 1 | -1/+1 |
* | rebase: extract code for writing basic state | Martin von Zweigbergk | 2011-02-10 | 1 | -4/+1 |
* | rebase: extract merge code to new source file | Martin von Zweigbergk | 2011-02-10 | 1 | -0/+154 |