diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-05-09 07:12:44 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-09 07:12:44 +0400 |
commit | 32a27b56662b1c7aa13f98c95f170ba5290c7559 (patch) | |
tree | b7a5665ff852003e2a4a595c98734cdb5ab8bf0d /read-cache.c | |
parent | 6233a5210ef64ba31bbf0e867e03e9176e0aace9 (diff) | |
parent | 15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371 (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
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions