![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 May 2008 03:12:44 +0000 (20:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 May 2008 03:12:44 +0000 (20:12 -0700) | ||
| commit | 32a27b56662b1c7aa13f98c95f170ba5290c7559 | |
| tree | b7a5665ff852003e2a4a595c98734cdb5ab8bf0d | tree | snapshot |
| parent | 6233a5210ef64ba31bbf0e867e03e9176e0aace9 | commit | diff |
| parent | 15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371 | commit | diff |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
doc: clarify definition of "update" for git-add -u
* maint-1.5.4:
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
doc: clarify definition of "update" for git-add -u
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/git-add.txt | diff1 | | diff2 | | blob | history |