diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-19 23:52:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-19 23:52:05 -0700 |
| commit | 2bd452d3b9f62ecc3406307cd6a5553856d21ff2 (patch) | |
| tree | 5067e797be715933670ac52893b45f071b558aa4 /.gitignore | |
| parent | Add git-unresolve <paths>... (diff) | |
| download | tgif-2bd452d3b9f62ecc3406307cd6a5553856d21ff2.tar.xz | |
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>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
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 |