diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-20 11:29:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 11:29:35 -0700 |
| commit | 49559cad6cab8af548321249d320d9bb372d1859 (patch) | |
| tree | 16298e6fac5bde5fc951e20f46c42927cdad8ea0 /git-difftool--helper.sh | |
| parent | Merge branch 'fl/askpass' (diff) | |
| parent | Documentation: improve description of "git reset --keep" (diff) | |
| download | tgif-49559cad6cab8af548321249d320d9bb372d1859.tar.xz | |
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"
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions