Package: git
Version: 1:1.7.10.4-2
Severity: wishlist

Dear Maintainer,

could you consider improving the following points in the  man page of git 
stash, section git stash save?

1)
"Save your local modifications to a new stash, and run git reset --hard to 
revert them."
this seems not true if --keep-index is given, (seen by experience)

2)
"If the --keep-index option is used, all changes already added to the index are 
left intact."
True but it does not says that worktree is set to index (seen by experience)

3)
"The --patch option implies --keep-index. You can use --no-keep-index to 
override this."
Yes but then what will be set to the final index?

To be schematic what I've understood is the following:

git stash save: IS=I0, WS=W0, HS=HEAD, I1=W1=HEAD
git stash save –keep-index: IS=I0,WS=W0,  HS=HEAD, I1=W1=I0
git stash save --patch (implies –keep-index)
   P:=patches chosen among W0-HEAD
   IS=I0, WS=HEAD+P,  HS=HEAD,  I1=I0, W1=W0-P
git stash save --patch –no-keep-index
   P:=patches chosen among HEAD-W0
   IS=I0, WS=HEAD+P,  HS=HEAD, W1=W0-P, I1=???(not tested by lack of time)

Where:
I0,I1,IS=initial/final/stashed index
W0,W1,WS= initial/final/stashed worktree
HS =stashed head

why not adding a table with (an improvement) of the above summary?

regards
ric

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (900, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.9-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages git depends on:
ii  git-man          1:1.7.10.4-2
ii  libc6            2.17-3
ii  libcurl3-gnutls  7.30.0-2
ii  liberror-perl    0.17-1
ii  libexpat1        2.1.0-3
ii  perl-modules     5.14.2-21
ii  zlib1g           1:1.2.8.dfsg-1

Versions of packages git recommends:
ii  less                         458-2
ii  openssh-client [ssh-client]  1:6.2p2-4
ii  patch                        2.6.1-3
ii  rsync                        3.0.9-4

Versions of packages git suggests:
ii  gettext-base                          0.18.2.1-1
pn  git-arch                              <none>
pn  git-cvs                               <none>
pn  git-daemon-run | git-daemon-sysvinit  <none>
pn  git-doc                               <none>
pn  git-el                                <none>
pn  git-email                             <none>
pn  git-gui                               <none>
pn  git-svn                               <none>
pn  gitk                                  <none>
pn  gitweb                                <none>

-- no debconf information


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to