mirror of
https://github.com/git/git.git
synced 2024-10-06 15:41:36 +02:00
f37d0cc3ff
"git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net> |
||
|---|---|---|
| .. | ||
| isolate-bugs-with-bisect.txt | ||
| make-dist.txt | ||
| rebase-and-edit.txt | ||
| rebase-from-internal-branch.txt | ||
| rebuild-from-update-hook.txt | ||
| revert-branch-rebase.txt | ||
| using-topic-branches.txt | ||