mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 08:47:56 +01:00
Code Activity

Merge branch 'jk/am-skip-hint'

Browse source 
* jk/am-skip-hint:
  git-am: suggest what to do with superfluous patches
This commit is contained in:
Junio C Hamano 2010-06-18 11:16:56 -07:00
commit af2fc76b4a
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-am.sh
View file

@ -726,6 +726,8 @@ do
resolved=
git diff-index --quiet --cached HEAD -- && {
echo "No changes - did you forget to use 'git add'?"
echo "If there is nothing left to stage, chances are that something else"
echo "already introduced the same changes; you might want to skip this patch."
stop_here_user_resolve $this
}
unmerged=$(git ls-files -u)