Merge branch 'jc/unresolve' into next

* jc/unresolve:
git-update-index --unresolve

diff --combined .gitignore
index a536f32497b75f95b7943c9c639bdf4df0777145,b5959d63116aa1e3e900f43a137295b47376e1e0..145f8555ad4b5c13cb7a6076cf7d9e809beff952
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -111,7 -111,6 +111,6 @@@ git-ta
  git-tar-tree
  git-unpack-file
  git-unpack-objects
- git-unresolve
  git-update-index
  git-update-ref
  git-update-server-info
@@@ -124,7 -123,6 +123,7 @@@ git-write-tre
  git-core-*/?*
  test-date
  test-delta
 +test-gsimm
  common-cmds.h
  *.tar.gz
  *.dsc

diff --combined Makefile
index 858e58ddd2248fe4299d88759daa204ce3678fa0,3ecd674c14d279e81a37c666cba419656fe044c0..9cbb90b95d88e5928cfc5207c581a933b140ecad
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -165,8 -165,7 +165,7 @@@ PROGRAMS = 
        git-upload-pack$X git-verify-pack$X git-write-tree$X \
        git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
        git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
-       git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
-       git-unresolve$X
+       git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
  
  BUILT_INS = git-log$X
  
@@@ -607,9 -606,6 +606,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
  
 +test-gsimm$X: test-gsimm.c gsimm.o rabinpoly.o
 +      $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
 +
  check:
        for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
@@@ -658,7 -654,6 +657,7 @@@ clean
        rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
                $(LIB_FILE) $(XDIFF_LIB)
        rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
 +      rm -f test-date$X test-delta$X test-gsimm$X
        rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
        rm -rf $(GIT_TARNAME)
        rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz