From: Derek S. Ray Date: Wed, 25 Mar 2015 21:07:10 +0000 (-0400) Subject: Fix 'fetch' syntax, include sparkly 'git log' trick X-Git-Tag: NetHack-3.6.0_RC01~552 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12ca92aa4236133e776411ddab81cbde05a9adaa;p=nethack Fix 'fetch' syntax, include sparkly 'git log' trick And bolt a couple more Win32-folders onto .gitignore. --- diff --git a/.gitignore b/.gitignore index 302497de0..db40c9ab4 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,8 @@ core Makefile # Win32-specific ignores +Debug/ +Release/ binary/ build/ Nethack.sln diff --git a/DEVEL/git_recipes.txt b/DEVEL/git_recipes.txt index 88af7f927..5e8d872f9 100644 --- a/DEVEL/git_recipes.txt +++ b/DEVEL/git_recipes.txt @@ -32,6 +32,10 @@ you specify: -pretty=one: format output as a single line for each entry (branch): show the commits from (branch) instead of the current one +[*] git log --pretty=one --decorate --graph --all + +(This is best explained by executing and looking at the output.) + [*] git add (filename) [*] git nhadd (filename) @@ -101,10 +105,10 @@ the prior commit. [/end area-of-concern] -[*] git fetch [-a] +[*] git fetch [--all] Retrieve commits from the remote repository to your machine. -Including -a will get commits for all branches. +Including --all will get commits for all branches. Does NOT merge them into your local repository.