projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e5b98d eaf436c)
Merge branch 'cc/reset-keep'
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:35 +0000 (11:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:35 +0000 (11:29 -0700)
commit49559cad6cab8af548321249d320d9bb372d1859
tree16298e6fac5bde5fc951e20f46c42927cdad8ea0tree | snapshot
parent2e5b98d9064292881fb1fd7c327948c7057a490acommit | diff
parenteaf436c09c09a28804697c89f3ff9a7e1ad2361ccommit | 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"
builtin/reset.c diff1 | diff2 | blob | history
Git—the stupid content tracker