Browse Source

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>
maint
Olaf Hering 19 years ago committed by Junio C Hamano
parent
commit
180b0d7483
  1. 2
      git-merge.sh
  2. 2
      git-resolve.sh

2
git-merge.sh

@ -131,7 +131,7 @@ case "$#,$common,$no_commit" in @@ -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" &&

2
git-resolve.sh

@ -41,7 +41,7 @@ case "$common" in @@ -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

Loading…
Cancel
Save