What does each of the [y,n,q,a,d,/,K,j,J,g,e,?] stand for in context of git -p

前端 未结 2 1907
情歌与酒
情歌与酒 2020-12-07 06:27

When using -p mode of git add -p or git stash -p what does each of the letters stand for?

I\'m guessing y is yes and n

2条回答
  •  刺人心
    刺人心 (楼主)
    2020-12-07 07:29

    The meaning of these letters can be found by typing ? and hit the Enter key. For me these didn't come when run git add --help. I got the meaning of these options as below :-

    Arup-iMac:$ git add -p
    diff --git a/app/interactors/reporting_groups/list_colleagues.rb b/app/interactors/reporting_groups/list_colleagues.rb
    index adc28af..f46f5e3 100644
    --- a/app/interactors/reporting_groups/list_colleagues.rb
    +++ b/app/interactors/reporting_groups/list_colleagues.rb
    @@ -14,7 +14,4 @@ module ReportingGroups
             reporting_group.employees_from_team_sub_reporting_groups
           else
             reporting_group.users
    -      end
    -    end
    -  end
    -end
    +      
    Stage this hunk [y,n,q,a,d,/,e,?]? ? <-- Look here, what I typed to get these.
    y - stage this hunk
    n - do not stage this hunk
    q - quit; do not stage this hunk nor any of the remaining ones
    a - stage this hunk and all later hunks in the file
    d - do not stage this hunk nor any of the later hunks in the file
    g - select a hunk to go to
    / - search for a hunk matching the given regex
    j - leave this hunk undecided, see next undecided hunk
    J - leave this hunk undecided, see next hunk
    k - leave this hunk undecided, see previous undecided hunk
    K - leave this hunk undecided, see previous hunk
    s - split the current hunk into smaller hunks
    e - manually edit the current hunk
    ? - print help
    @@ -14,7 +14,4 @@ module ReportingGroups
             reporting_group.employees_from_team_sub_reporting_groups
           else
             reporting_group.users
    -      end
    -    end
    -  end
    -end
    +      
    Stage this hunk [y,n,q,a,d,/,e,?]? 
    

提交回复
热议问题