![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Dec 2008 09:21:45 +0000 (01:21 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Dec 2008 09:21:45 +0000 (01:21 -0800) |
* lt/reset-merge:
Document "git-reset --merge"
Add 'merge' mode to 'git reset'
Document "git-reset --merge"
Add 'merge' mode to 'git reset'
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git-reset.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-reset.txt
Simple merge