summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2006-02-11 11:26:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-10 02:13:19 (GMT)
commit180b0d7483711120e28289ff7d9fa346eddd5cb7 (patch)
tree5001ff628cce6efd777f8a064bcca07643517eb5 /git-merge.sh
parentf61c2c970c08653ade940fce678c7591abcfcde4 (diff)
downloadgit-180b0d7483711120e28289ff7d9fa346eddd5cb7.zip
git-180b0d7483711120e28289ff7d9fa346eddd5cb7.tar.gz
git-180b0d7483711120e28289ff7d9fa346eddd5cb7.tar.bz2
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-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 7be9e81..cc0952a 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" &&