| commit | 00f03061e27cad5497abcca2b70fa9fa04818275 | |
| author | Johan Herland <johan@herland.net> | |
| Tue, 9 Nov 2010 21:49:50 +0000 (9 22:49 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 21:22:49 +0000 (17 13:22 -0800) | ||
| tree | e80f2b3b5bb4c517e4124c2f9115cd1e66e8a95c | treesnapshot (tar.gz zip) |
| parent | 3228e67120a8c71bf7804a5c52448a841d6f3b58 | commitdiff |
Documentation: Preliminary docs on 'git notes merge'
This patch has been improved by the following contributions:
- Stephen Boyd: Use "automatically resolves" instead of "auto-resolves"
- Stephen Boyd: Remove unbalanced '('
Thanks-to: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This patch has been improved by the following contributions:
- Stephen Boyd: Use "automatically resolves" instead of "auto-resolves"
- Stephen Boyd: Remove unbalanced '('
Thanks-to: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-notes.txt | diffblobblamehistory |