diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:50:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:50:03 -0700 |
| commit | 1f8115b113def8ee03701aa87b26c5e8b7c94434 (patch) | |
| tree | 3cfa19b2c6ce648c8f09b63c60e70828dd7cb208 /git-merge-resolve.sh | |
| parent | ca1c9913f8ac0ccaf976d44822076e1bba5bcd94 (diff) | |
| parent | 32a27b56662b1c7aa13f98c95f170ba5290c7559 (diff) | |
| download | git-1f8115b113def8ee03701aa87b26c5e8b7c94434.tar.gz | |
Merge branch 'maint'
* maint:
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
doc: clarify definition of "update" for git-add -u
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions