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 /convert-objects.c | |
| parent | ec167793d84ba7b765e1eb71b0257ce7baca2d26 (diff) | |
| download | git-2bd452d3b9f62ecc3406307cd6a5553856d21ff2.tar.gz | |
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 'convert-objects.c')
0 files changed, 0 insertions, 0 deletions