On Fri, Jun 18, 2010 at 10:33:03AM +1000, Chris Curran wrote: > On 06/18/2010 01:56 AM, Paul W. Frields wrote: > > On Thu, Jun 17, 2010 at 05:36:31AM +0000, Chris Curran wrote: > > > >> silly git merge.... > >> > >> en-US/Storage_Pools_Partitions.xml.orig | 360 ------------------------------- > >> 1 files changed, 0 insertions(+), 360 deletions(-) > >> > > In case anyone's interested, you can add a .gitignore file in the root > > of your module to block git from worrying about files like *.orig or > > backup files that might be created by different editors. You can also > > do this inside a subfolder to only ignore things in that part of a > > tree. > > > > http://book.git-scm.com/4_ignoring_files.html > > > > > You can also modify your last commit with git commit --amend [directory, > files or -a for all]. > > Fetch and rebase is better than using pull. Pull was how I made the > colossal mess in that commit :). Definitely Been There, Done That! :-) There is a 'git pull --rebase' as well, although in pursuit of understanding more, I tend nowadays to do a 'git fetch --all', then 'git status' to see if I can simply fast-forward to the end of the history, and then 'git pull' if so. -- Paul W. Frields http://paul.frields.org/ gpg fingerprint: 3DA6 A0AC 6D58 FEC4 0233 5906 ACDB C937 BD11 3717 http://redhat.com/ - - - - http://pfrields.fedorapeople.org/ Where open source multiplies: http://opensource.com -- docs mailing list docs@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe: https://admin.fedoraproject.org/mailman/listinfo/docs
