Johannes Sixt j...@kdbg.org writes:
Am 09.02.2015 um 13:53 schrieb Sergey Organov:
[...]
If you want a version of --preserve-merges that does what *you* need,
consider this commit:
git://repo.or.cz/git/mingw/j6t.git rebase-p-first-parent
Use it like this:
git rebase -i -p
Am 10.02.2015 um 12:46 schrieb Sergey Organov:
Johannes Sixt j...@kdbg.org writes:
Am 09.02.2015 um 13:53 schrieb Sergey Organov:
[...]
If you want a version of --preserve-merges that does what *you* need,
consider this commit:
git://repo.or.cz/git/mingw/j6t.git
Am 09.02.2015 um 13:53 schrieb Sergey Organov:
Johannes Sixt j...@kdbg.org writes:
Am 07.02.2015 um 22:32 schrieb Sebastian Schuberth:
On 06.02.2015 22:28, Sergey Organov wrote:
# Now rebase my work.
git rebase -f HEAD~1
# What? Where is my Precious change in a???
cat a
/SCRIPT
I.e.,
Johannes Sixt j...@kdbg.org writes:
Am 07.02.2015 um 22:32 schrieb Sebastian Schuberth:
On 06.02.2015 22:28, Sergey Organov wrote:
# Now rebase my work.
git rebase -f HEAD~1
# What? Where is my Precious change in a???
cat a
/SCRIPT
I.e., the modification marked [!] was silently lost
Am 07.02.2015 um 22:32 schrieb Sebastian Schuberth:
On 06.02.2015 22:28, Sergey Organov wrote:
# Now rebase my work.
git rebase -f HEAD~1
# What? Where is my Precious change in a???
cat a
/SCRIPT
I.e., the modification marked [!] was silently lost during rebase!
Just a wild guess:
On 06.02.2015 22:28, Sergey Organov wrote:
# Now rebase my work.
git rebase -f HEAD~1
# What? Where is my Precious change in a???
cat a
/SCRIPT
I.e., the modification marked [!] was silently lost during rebase!
Just a wild guess: Maybe because you omitted -p / --preserve-merges
from git
Hello,
I recently ran into an annoying problem: 'git rebase' apparently
silently drops changes in non-conflicting paths of merge commits
(git version 1.9.3).
Is it a bug or feature? Is there a way to flatten history using rebase,
yet preserve manual changes found in merge commits?
Here is
7 matches
Mail list logo