From 2bd452d3b9f62ecc3406307cd6a5553856d21ff2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 19 Apr 2006 23:52:05 -0700 Subject: git-update-index --unresolve Retire git-unresolve and make it into "git-update-index --unresolve". It processes all paths that follow. During a merge, you would mark a path that is dealt with with: $ git update-index hello and you would "undo" it with: $ git update-index --unresolve hello Signed-off-by: Junio C Hamano --- .gitignore | 1 - 1 file changed, 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 1e4ba7b209..b5959d6311 100644 --- a/.gitignore +++ b/.gitignore @@ -111,7 +111,6 @@ git-tag git-tar-tree git-unpack-file git-unpack-objects -git-unresolve git-update-index git-update-ref git-update-server-info -- cgit v1.2.3