![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 20 Apr 2006 06:52:05 +0000 (23:52 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 20 Apr 2006 06:52:05 +0000 (23:52 -0700) | ||
| commit | 2bd452d3b9f62ecc3406307cd6a5553856d21ff2 | |
| tree | 5067e797be715933670ac52893b45f071b558aa4 | tree | snapshot |
| parent | ec167793d84ba7b765e1eb71b0257ce7baca2d26 | commit | diff |
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 <junkio@cox.net>
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 <junkio@cox.net>
| .gitignore | diff | blob | history | |
| Makefile | diff | blob | history | |
| unresolve.c | [deleted file] | blob | history |
| update-index.c | diff | blob | history |