diff options
| author | Olaf Hering <olh@suse.de> | 2006-02-11 14:26:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-10 05:13:19 +0300 |
| commit | 180b0d7483711120e28289ff7d9fa346eddd5cb7 (patch) | |
| tree | 5001ff628cce6efd777f8a064bcca07643517eb5 /git-resolve.sh | |
| parent | f61c2c970c08653ade940fce678c7591abcfcde4 (diff) | |
allow double click on current HEAD id after git-pull
Double click on to current HEAD commit id is not possible,
the dot has to go.
[jc: by popular requests.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-resolve.sh')
| -rwxr-xr-x | git-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-resolve.sh b/git-resolve.sh index b53ede8d87..1c7aaefa25 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -41,7 +41,7 @@ case "$common" in exit 0 ;; "$head") - echo "Updating from $head to $merge." + echo "Updating from $head to $merge" git-read-tree -u -m $head $merge || exit 1 git-update-ref HEAD "$merge" "$head" git-diff-tree -p $head $merge | git-apply --stat |