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