Re: [git-users] What is the best way to visualize branch history line?
I tried gitk today and got blown away that I completely missed this. It helps me understand the current state of my local branch in a way I couldn't before. Many Thanks. On Monday, May 12, 2014 10:57:06 PM UTC-4, charlesmanning wrote: I like gitk. On Tue, May 13, 2014 at 2:20 PM, Leonardo Petry leonardo...@gmail.comjavascript: wrote: What would be the best command to view a branch history? Right now I use *git show-branch* but I get a huge list of commits and branches. Ideally I would like to see a couple of previous commits and be able to see the which files where added to each commit. On another topic I would appreciate any tips on when I should prefer merge over rebase. -- 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+...@googlegroups.com javascript:. For more options, visit https://groups.google.com/d/optout. -- 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] ignore a file without listing it in .gitignore (only locally)
In the project I am working on there is a config file with some DB users and password. I want this file not to be tracked in my local machine, but if there are updates to it, I want to receive those updates from the remote. Here is how I do it now: $ git add file # *all changed files except the config file with password (my password and user are different)* $ git stash # *here I stash the changes to the config file with the different password* $ git pull branch $ git push branch $git stash pop # *here I get my changes back* The config file as you can imagine is not on .gitignore, and it is not going to be, I would like to know if there is a way to avoid using stash. Thanks for any tip. -- 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] What is the best way to visualize branch history line?
What would be the best command to view a branch history? Right now I use *git show-branch* but I get a huge list of commits and branches. Ideally I would like to see a couple of previous commits and be able to see the which files where added to each commit. On another topic I would appreciate any tips on when I should prefer merge over rebase. -- 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.