1. 06 Sep, 2008 1 commit
  2. 16 Aug, 2008 1 commit
    • Stephan Beyer's avatar
      git-stash: improve synopsis in help and manual page · a5ab00c5
      Stephan Beyer authored
      "git stash -h" showed some incomplete and ugly usage information.
      For example, the useful "--keep-index" option for "save" or the "--index"
      option for  "apply" were not shown. Also in the documentation synopsis they
      were not shown, so that there is no incentive to scroll down and even see
      that such options exist.
      
      This patch improves the git-stash synopsis in the documentation by
      mentioning that further options to the stash commands and then copies
      this synopsis to the usage information string of git-stash.sh.
      
      For the latter, the dashless git command string has to be inserted on the
      second and the following usage lines. The code of this is taken from
      git-sh-setup so that all lines will show the command string.
      
      Note that the "create" command is not advertised at all now, because
      it was not mentioned in git-stash.txt.
      Signed-off-by: default avatarStephan Beyer <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      a5ab00c5
  3. 06 Aug, 2008 1 commit
  4. 23 Jul, 2008 1 commit
  5. 05 Jul, 2008 2 commits
  6. 15 May, 2008 1 commit
  7. 23 Feb, 2008 2 commits
  8. 07 Jan, 2008 1 commit
  9. 05 Jan, 2008 1 commit
  10. 22 Dec, 2007 1 commit
  11. 03 Dec, 2007 1 commit
  12. 29 Nov, 2007 1 commit
  13. 28 Nov, 2007 1 commit
  14. 07 Nov, 2007 1 commit
  15. 06 Nov, 2007 1 commit
  16. 19 Oct, 2007 2 commits
  17. 15 Sep, 2007 1 commit
    • Junio C Hamano's avatar
      stash: implement "stash create" · bc9e7399
      Junio C Hamano authored
      This subcommand creates a stash from the current state and writes out the
      resulting commit object ID to the standard output, without updating the
      stash ref nor resetting the tree.  It is intended to be used by scripts
      to temporarily rewind the working tree to a clean state.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      bc9e7399
  18. 12 Sep, 2007 1 commit
  19. 28 Jul, 2007 3 commits
    • Junio C Hamano's avatar
      git-stash apply --index: optimize postprocessing · 83b3df7d
      Junio C Hamano authored
      Originally, "apply --index" codepath was bolted on to the
      "update working tree files and index, but then revert the
      changes we make to the index except for added files so that we
      do not forget about them" codepath, almost as an afterthought.
      Because "apply --index" first prepares the final index state
      upfront, "revert except the added paths" postprocessing does not
      have to be done.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      83b3df7d
    • Junio C Hamano's avatar
      Fix git-stash apply --index · cbeaccc3
      Junio C Hamano authored
      Two bugs that made the command practically unusable were fixed
      with this.
      
       - A stash created with a clean index does not have any
         difference between the base tree and the index tree.
         Trying to apply the diff between them to the index would
         error out with "No changes".  Even when the user asked to
         unstash with --index, do not bother with --index action if
         the base tree and the index tree match.
      
       - After successfully performing the working tree merge, the
         index was reloaded from an earlier state of unstashed index
         with "read-tree"; this left all the paths cache dirty.  By
         moving the call to git-status after this read-tree, match the
         cached stat information in the index.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      cbeaccc3
    • しらいしななこ's avatar
      git-stash: Make sure reflog is created for refs/stash · f12e925a
      しらいしななこ authored
      Earlier commit 7ab3cc70 fixed "stash clear" but broke save_stash,
      because it forgot to make sure the reflog file exists before saving.
      Signed-off-by: default avatarNanako Shiraishi <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      f12e925a
  20. 27 Jul, 2007 1 commit
  21. 25 Jul, 2007 1 commit
  22. 09 Jul, 2007 1 commit
  23. 07 Jul, 2007 1 commit
  24. 06 Jul, 2007 2 commits
  25. 04 Jul, 2007 2 commits
  26. 03 Jul, 2007 2 commits
  27. 02 Jul, 2007 2 commits
  28. 01 Jul, 2007 2 commits