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>
Olaf Hering committed
Feb 11, 2006 at 12:26 UTC
180b0d7483711120e28289ff7d9fa346eddd5cb7
2 files changed
+2
-2
git-merge.sh
+1
-1
@@ -131,7 +131,7 @@ case "$#,$common,$no_commit" in
131
;;
132
1,"$head",*)
133
# Again the most common case of merging one remote.
134
- echo "Updating from $head to $1."
134
+ echo "Updating from $head to $1"
135
git-update-index --refresh 2>/dev/null
136
new_head=$(git-rev-parse --verify "$1^0") &&
137
git-read-tree -u -v -m $head "$new_head" &&
git-resolve.sh
+1
-1
@@ -41,7 +41,7 @@ case "$common" in
41
exit 0
42
;;
43
"$head")
44
- echo "Updating from $head to $merge."
44
+ echo "Updating from $head to $merge"
45
git-read-tree -u -m $head $merge || exit 1
46
git-update-ref HEAD "$merge" "$head"
47
git-diff-tree -p $head $merge | git-apply --stat