Hi Philip and all you, I'm too confused, maybe going by degrees is the best.
Let's suppose - we have a "*master*" branch linear history composed by 4 commits, - in the third commit of "*master*" branch was created a file " *readMe.txt*", unchanged in the fourth commit of "*master*" branch history, - we have also a "*daughter*" branch generated just after the second commit of "*master*" branch (before the third commit of "*master*" branch ), - during the "*daughter*" branch commit history, a different file " *readMe.txt*" was created. In this situation I execute *git rebase -i --allow-empty-message --keep-empty --stat -v --verify --no-ff "master" "daughter"* and I find that "*daughter*" "*readMe.txt*" file is *silently* set in the rebased history, resulting as the current file version. Indeed I expected an *explicit merging request*: why not? How possible? What was I wrong? I tried also *git rebase -i --allow-empty-message --keep-empty --stat -v --verify --no-ff --merge "master" "daughter"* with no effect! I'm very frustrated: - maybe would I explicitly have to set "merge" option (instead of default "pick" option) in the first row of todo-file? - maybe I was wrong in any *above command line option*? What are the correct approaches? Thanks in advance for your patience. Il giorno sabato 6 aprile 2019 10:53:48 UTC+2, never...@gmail.com ha scritto: > > Hi all, > could anyone clarify the meaning and the usage of > > - *--root* command line option, > - *--merge* command line option (Maybe is it anyway related to merge > option in interactive todo-file?), > > possibly providing an example in principle? > The official documentation is very obscure because too synthetic ... it > could be understood just by whoever already knows GiT. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
