Re: [git-users] Git rebase including initial commit
On Wed, 24 Jun 2015 10:13:22 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: How to rebase the following commits? I have: A---B---C orig D---E---F dev [...] Does simple git rebase --root --onto orig dev work? I've just recreated such a history, and it works for me: foo% git slog orig 272fee5 C 081df92 B a75960c A foo% git slog dev a3c7485 F 3217145 E 962c0e8 D foo% git rebase --root --onto orig dev First, rewinding head to replay your work on top of it... Applying: D Applying: E Applying: F foo% git slog dev ae40dbd F 856ba3c E 3fb1f7a D 272fee5 C 081df92 B a75960c A -- 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.
Re: [git-users] Git rebase including initial commit
On Wed, 24 Jun 2015 11:06:52 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: $ git rebase --root --onto orig dev First, rewinding head to replay your work on top of it... Applying: E Applying: F The result is: A---B---C orig \ E---F dev Still missing the D root of dev. Can you proof that dev indeed has that D commit? I mean, miracles are rare and far in between so I'd rather beleive you're misinterpreting what's in your *real* history. The thing is, --onto and --root disable the rebase's default logic for figuring out what part of the tree to be rebased to pick and where to tuck it onto. Basically, it's just like saying don't be smart, do what I said, period. So to me, it really looks like there's no that D commit. What happens if you do git rev-list dev ? Does it really show you all the commits you need? -- 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.
Re: [git-users] Git rebase including initial commit
On Wed, 24 Jun 2015 11:13:26 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: Branch history before rebase is following: $ git log orig --oneline 61ef11b C 0458ee6 B e714739 A $ git log dev --oneline 4f9a02e F 69eabea E dbdf75f D Are there merges on dev? That is, what does git log --graph --decorate --oneline orig dev show? Just two single disjoint lines? -- 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.
Re: [git-users] Git rebase including initial commit
$ git rebase --root --onto orig dev First, rewinding head to replay your work on top of it... Applying: E Applying: F The result is: A---B---C orig \ E---F dev Still missing the D root of dev. 2015. június 24., szerda 20:01:17 UTC+2 időpontban Konstantin Khomoutov a következőt írta: On Wed, 24 Jun 2015 10:13:22 -0700 (PDT) Konrád Lőrinczi klor...@gmail.com javascript: wrote: How to rebase the following commits? I have: A---B---C orig D---E---F dev [...] Does simple git rebase --root --onto orig dev work? I've just recreated such a history, and it works for me: foo% git slog orig 272fee5 C 081df92 B a75960c A foo% git slog dev a3c7485 F 3217145 E 962c0e8 D foo% git rebase --root --onto orig dev First, rewinding head to replay your work on top of it... Applying: D Applying: E Applying: F foo% git slog dev ae40dbd F 856ba3c E 3fb1f7a D 272fee5 C 081df92 B a75960c A -- 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.
Re: [git-users] Git rebase including initial commit
Branch history before rebase is following: $ git log orig --oneline 61ef11b C 0458ee6 B e714739 A $ git log dev --oneline 4f9a02e F 69eabea E dbdf75f D 2015. június 24., szerda 20:06:52 UTC+2 időpontban Konrád Lőrinczi a következőt írta: $ git rebase --root --onto orig dev First, rewinding head to replay your work on top of it... Applying: E Applying: F The result is: A---B---C orig \ E---F dev Still missing the D root of dev. 2015. június 24., szerda 20:01:17 UTC+2 időpontban Konstantin Khomoutov a következőt írta: On Wed, 24 Jun 2015 10:13:22 -0700 (PDT) Konrád Lőrinczi klor...@gmail.com wrote: How to rebase the following commits? I have: A---B---C orig D---E---F dev [...] Does simple git rebase --root --onto orig dev work? I've just recreated such a history, and it works for me: foo% git slog orig 272fee5 C 081df92 B a75960c A foo% git slog dev a3c7485 F 3217145 E 962c0e8 D foo% git rebase --root --onto orig dev First, rewinding head to replay your work on top of it... Applying: D Applying: E Applying: F foo% git slog dev ae40dbd F 856ba3c E 3fb1f7a D 272fee5 C 081df92 B a75960c A -- 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.
[git-users] Git rebase including initial commit
How to rebase the following commits? I have: A---B---C orig D---E---F dev I would like to rebase dev over orig branch, so I have the following result: A---B---C---D---E---F I tried this: git rebase orig dev But the result the following. A---B---C orig \ E---F dev The initial commit named as D is missing. I tried this: $ git checkout orig $ git rebase --root -v dev Changes from to 9ab1c4999ca54f068a04fe116f23676ba9388ed7: fatal: ambiguous argument '': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git command [revision...] -- [file...]' Switched to branch 'dev' Note: checking out '9ab1c4999ca54f068a04fe116f23676ba9388ed7'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new-branch-name HEAD is now at 9ab1c49... Rebasing (1/3) dbdf75f50b4eb08c23b90bf03488cc61de6cd9fd Rebasing (2/3) 69eabea744f42990089aaf1334381e455a680bbe [detached HEAD 39b8b7f] E Date: Wed Jun 24 17:27:28 2015 +0200 1 file changed, 1 insertion(+) create mode 100644 file2 Rebasing (3/3) 4f9a02e3d0ff854e4190575192c824712028d085 [detached HEAD e804aa2] F Date: Wed Jun 24 17:30:40 2015 +0200 1 file changed, 1 insertion(+), 1 deletion(-) Successfully rebased and updated refs/heads/dev. The result is: A---B---C orig D---E---F dev Another way: $ git rebase -v --onto orig --root dev Changes from to 61ef11b64bae2695425c1dee47566b987076ed91: fatal: ambiguous argument '': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git command [revision...] -- [file...]' First, rewinding head to replay your work on top of it... Applying: E Applying: F The result is: A---B---C orig \ E---F dev Still missing the D root of dev. What I do wrong? Thanks, Konrad -- 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.
Re: [git-users] Git rebase including initial commit
No merges on any of the branches. I created this repo just for testing and it is as simple as shown earlier. I use Git Extensions, and I see (before rebase) two separate branches. 2015.06.24. 20:26 ezt írta (Konstantin Khomoutov flatw...@users.sourceforge.net): On Wed, 24 Jun 2015 11:13:26 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: Branch history before rebase is following: $ git log orig --oneline 61ef11b C 0458ee6 B e714739 A $ git log dev --oneline 4f9a02e F 69eabea E dbdf75f D Are there merges on dev? That is, what does git log --graph --decorate --oneline orig dev show? Just two single disjoint lines? -- 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.
[git-users] Benevolent Dictator Workflow Pattern and Pre-Commit Code Review Tools on Remote Repository
I'm very interested in running pre-commit code reviews, however I have a couple of obstacles in my way... All the code-review tools expect to manage their own repository. I'm in a situation where our repository remote. Ideally, what I would like to do is: 1) Developers pull from remote master 2) Developers commit push to benevolent dictator repo (which code review tool is watching) 3) Commit on benevolent dictator repo is reviewed and approved 4) Code Review system pushes from dictator repo to remote master 5) Continuous Integration/Deploy process is kicked off when seeing new commit on master So far, I can't find any system or process to accomplish steps 3 4... I understand it could be done if pushing to an individual's repository for review and push, but we would lose out on centralized tooling and visibility that Gerrit/Stash/Phabricator could provide. Has anyone tried this setup successfully? Thanks! ~t -- 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.
