FWIW, I'm in the middle of reading the OReilly Git book and it is quite good. I find it more helpful than the git PDF, but maybe it's because I'm taking the time to sit down and read a dead tree version.
Gary <div>-------- Original message --------</div><div>From: Matt Sicker <[email protected]> </div><div>Date:09/01/2014 12:14 (GMT-05:00) </div><div>To: Log4J Developers List <[email protected]> </div><div>Subject: Re: [3/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 </div><div> </div>Exactly. It keeps a cleaner history. The only time to use it, though, is on history that hasn't been pushed elsewhere (i.e., your local history). Otherwise, you'll get an error when you try to push it. On 1 September 2014 00:42, Remko Popma <[email protected]> wrote: I'm still learning about git (reading the first 3 chapters of this free book: http://git-scm.com/book ) and I just found out about rebasing. My understanding is rebasing is a way to merge that leaves a cleaner history. Still learning more about the details. On Mon, Sep 1, 2014 at 1:49 PM, Matt Sicker <[email protected]> wrote: I believe there is a setting in EGit to automatically rebase before pushing. I'm just used to use it from the command line. If there isn't, no big deal. On 31 August 2014 21:36, Gary Gregory <[email protected]> wrote: Matt, I'm trying to understand what happened here... I did a commit from Eclipse/EGit and choose "Commit and Push". What is the problem you are trying to solve? Gary On Sun, Aug 31, 2014 at 2:55 PM, Matt Sicker <[email protected]> wrote: Might I recommend in the future how to reconcile this problem: git push (failed due to out of date tree) git pull git rebase git push That way you can get away without adding merge commits. Really, the only time merge commits are useful is when you've already pushed your branch or repository elsewhere. If it's still local, you can do "git rebase" to clean the history a bit and prevent additional commits. Here's some more info: http://stackoverflow.com/questions/804115/when-do-you-use-git-rebase-instead-of-git-merge ---------- Forwarded message ---------- From: <[email protected]> Date: 31 August 2014 13:44 Subject: [3/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 To: [email protected] Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f836dad9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f836dad9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f836dad9 Branch: refs/heads/master Commit: f836dad9ba5b6b141462e1a9f33ec60a351917ff Parents: 7271488 5808022 Author: Gary Gregory <[email protected]> Authored: Sun Aug 31 14:43:03 2014 -0400 Committer: Gary Gregory <[email protected]> Committed: Sun Aug 31 14:43:03 2014 -0400 ---------------------------------------------------------------------- pom.xml | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f836dad9/pom.xml ---------------------------------------------------------------------- -- Matt Sicker <[email protected]> -- E-Mail: [email protected] | [email protected] Java Persistence with Hibernate, Second Edition JUnit in Action, Second Edition Spring Batch in Action Blog: http://garygregory.wordpress.com Home: http://garygregory.com/ Tweet! http://twitter.com/GaryGregory -- Matt Sicker <[email protected]> -- Matt Sicker <[email protected]>
