![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 20 Mar 2010 18:29:35 +0000 (11:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 20 Mar 2010 18:29:35 +0000 (11:29 -0700) | ||
| commit | 49559cad6cab8af548321249d320d9bb372d1859 | |
| tree | 16298e6fac5bde5fc951e20f46c42927cdad8ea0 | tree | snapshot |
| parent | 2e5b98d9064292881fb1fd7c327948c7057a490a | commit | diff |
| parent | eaf436c09c09a28804697c89f3ff9a7e1ad2361c | commit | diff |
Merge branch 'cc/reset-keep'
* cc/reset-keep:
Documentation: improve description of "git reset --keep"
reset: disallow using --keep when there are unmerged entries
reset: disallow "reset --keep" outside a work tree
Documentation: reset: describe new "--keep" option
reset: add test cases for "--keep" option
reset: add option "--keep" to "git reset"
* cc/reset-keep:
Documentation: improve description of "git reset --keep"
reset: disallow using --keep when there are unmerged entries
reset: disallow "reset --keep" outside a work tree
Documentation: reset: describe new "--keep" option
reset: add test cases for "--keep" option
reset: add option "--keep" to "git reset"
| builtin/reset.c | diff1 | | | | blob | history |