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
/
t
/
t3409-rebase-preserve-merges.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2018-11-02
tests: optionally skip `git rebase -p` tests
Johannes Schindelin
1
-0
/
+5
2013-08-21
rebase --preserve-merges: ignore "merge.log" config
Ralf Thielow
1
-0
/
+23
2013-06-07
add tests for rebasing merged history
Martin von Zweigbergk
1
-53
/
+0
2011-06-19
rebase -i -p: include non-first-parent commits in todo list
Andrew Wong
1
-1
/
+27
2011-04-28
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
Andrew Wong
1
-1
/
+31
2010-11-03
Change incorrect "remote branch" to "remote tracking branch" in C code
Matthieu Moy
1
-1
/
+1
2010-09-09
tests: subshell indentation stylefix
Jonathan Nieder
1
-6
/
+7
2010-09-06
Several tests: cd inside subshell instead of around
Jens Lehmann
1
-6
/
+6
2009-11-29
t3409 t4107 t7406 t9150: use dashless commands
Matthew Ogilvie
1
-3
/
+3
2009-08-09
merge: indicate remote tracking branches in merge message
Jeff King
1
-1
/
+1
2008-12-24
rebase -i -p: leave a --cc patch when a merge could not be redone
Johannes Schindelin
1
-0
/
+1
2008-12-21
rebase -i -p: Fix --continue after a merge could not be redone
Johannes Sixt
1
-1
/
+1
2008-12-21
Show a failure of rebase -p if the merge had a conflict
Johannes Sixt
1
-11
/
+44
2008-09-30
rebase: Support preserving merges in non-interactive mode
Andreas Ericsson
1
-0
/
+61