diff options
| author | Olaf Hering <olh@suse.de> | 2006-02-11 12:26:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-09 18:13:19 -0800 |
| commit | 180b0d7483711120e28289ff7d9fa346eddd5cb7 (patch) | |
| tree | 5001ff628cce6efd777f8a064bcca07643517eb5 | |
| parent | f61c2c970c08653ade940fce678c7591abcfcde4 (diff) | |
| download | git-180b0d7483711120e28289ff7d9fa346eddd5cb7.tar.gz | |
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>
| -rwxr-xr-x | git-merge.sh | 2 | ||||
| -rwxr-xr-x | git-resolve.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index 7be9e81f1f..cc0952a97d 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -131,7 +131,7 @@ case "$#,$common,$no_commit" in ;; 1,"$head",*) # Again the most common case of merging one remote. - echo "Updating from $head to $1." + echo "Updating from $head to $1" git-update-index --refresh 2>/dev/null new_head=$(git-rev-parse --verify "$1^0") && git-read-tree -u -v -m $head "$new_head" && 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 |