index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-rebase--merge.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2016-06-27
Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'
Junio C Hamano
1
-2
/
+2
2016-06-17
rebase: update comment about FreeBSD /bin/sh
Ed Maste
1
-2
/
+2
2016-04-24
git-rebase--merge: don't include absent parent as a base
Ben Woosley
1
-1
/
+3
2014-12-01
*.sh: avoid hardcoding $GIT_DIR/hooks/...
Nguyễn Thái Ngọc Duy
1
-4
/
+2
2014-07-02
Merge branch 'bc/fix-rebase-merge-skip'
Junio C Hamano
1
-2
/
+3
2014-06-16
rebase--merge: fix --skip with two conflicts in a row
brian m. carlson
1
-2
/
+3
2014-06-03
Merge branch 'ep/shell-command-substitution'
Junio C Hamano
1
-2
/
+2
2014-04-23
git-rebase--merge.sh: use the $( ... ) construct for command substitution
Elia Pinto
1
-2
/
+2
2014-04-21
Merge branch 'km/avoid-non-function-return-in-rebase'
Junio C Hamano
1
-0
/
+15
2014-04-17
rebase: avoid non-function use of "return" on FreeBSD
Kyle J. McKay
1
-0
/
+15
2014-02-11
rebase: add the --gpg-sign option
Nicolas Vigier
1
-1
/
+1
2013-11-26
remove #!interpreter line from shell libraries
Jonathan Nieder
1
-1
/
+3
2013-05-12
rebase --merge: return control to caller, for housekeeping
Ramkumar Ramachandra
1
-3
/
+2
2012-06-26
rebase: don't source git-sh-setup twice
Martin von Zweigbergk
1
-2
/
+0
2012-02-26
rebase -m: only call "notes copy" when rewritten exists and is non-empty
Andrew Wong
1
-4
/
+7
2011-02-10
rebase -m: don't print exit code 2 when merge fails
Martin von Zweigbergk
1
-1
/
+1
2011-02-10
rebase: extract code for writing basic state
Martin von Zweigbergk
1
-4
/
+1
2011-02-10
rebase: extract merge code to new source file
Martin von Zweigbergk
1
-0
/
+154