summaryrefslogtreecommitdiff
path: root/git-stash.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/stash-require-clean-index'Junio C Hamano2015-06-241-2/+0
|\
| * Revert "stash: require a clean index to apply"jk/stash-require-clean-indexJeff King2015-06-151-2/+0
* | Merge branch 'jk/stash-options'Junio C Hamano2015-06-011-1/+16
|\ \
| * | stash: recognize "--help" for subcommandsjk/stash-optionsJeff King2015-05-201-0/+11
| * | stash: complain about unknown flagsJeff King2015-05-201-1/+5
* | | Merge branch 'jk/stash-require-clean-index'Junio C Hamano2015-05-191-0/+2
|\ \ \ | | |/ | |/|
| * | stash: require a clean index to applyJeff King2015-04-221-0/+2
| |/
* | git-stash: avoid hardcoding $GIT_DIR/logs/....Nguyễn Thái Ngọc Duy2014-12-011-2/+2
* | *.sh: respect $GIT_INDEX_FILENguyễn Thái Ngọc Duy2014-12-011-1/+1
|/
* Merge branch 'da/rev-parse-verify-quiet'Junio C Hamano2014-09-291-6/+7
|\
| * stash: prefer --quiet over shell redirection of the standard error streamda/rev-parse-verify-quietDavid Aguilar2014-09-191-6/+7
* | Merge branch 'ah/grammofix'Junio C Hamano2014-09-191-1/+1
|\ \ | |/ |/|
| * grammofix in user-facing messagesah/grammofixAlex Henrie2014-09-021-1/+1
* | Merge branch 'jk/stash-list-p'Junio C Hamano2014-09-091-1/+1
|\ \ | |/ |/|
| * stash: default listing to working-tree diffjk/stash-list-pJeff King2014-08-071-1/+1
| * Merge branch 'jc/stash-pop-not-popped' into maintJunio C Hamano2014-04-031-2/+8
| |\
* | \ Merge branch 'ep/shell-assign-and-export-vars'Junio C Hamano2014-06-061-1/+2
|\ \ \
| * | | scripts: "export VAR=VALUE" construct is not portableElia Pinto2014-05-231-1/+2
| |/ /
* | | git-stash.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-1/+1
* | | Merge branch 'jc/stash-pop-not-popped'Junio C Hamano2014-03-211-2/+8
|\ \ \ | |/ / |/| / | |/
| * stash pop: mention we did not drop the stash upon failing to applyjc/stash-pop-not-poppedJunio C Hamano2014-02-261-2/+8
* | stash: handle specifying stashes with $IFSow/stash-with-ifsØystein Walle2014-01-071-7/+7
|/
* Revert "git stash: avoid data loss when "git stash save" kills a directory"Junio C Hamano2013-08-141-12/+0
* git stash: avoid data loss when "git stash save" kills a directoryPetr Baudis2013-07-011-0/+12
* stash: introduce 'git stash store'Ramkumar Ramachandra2013-06-171-6/+41
* stash: simplify option parser for createRamkumar Ramachandra2013-06-171-4/+1
* Merge branch 'ph/stash-rerere'Junio C Hamano2012-09-031-0/+1
|\
| * stash: invoke rerere in case of conflictPhil Hord2012-08-171-0/+1
* | stash: use eval_gettextln correctlyRoss Lagerwall2012-04-141-2/+2
|/
* stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguateJonathon Mah2012-01-011-3/+4
* Merge branch 'bc/unstash-clean-crufts'Junio C Hamano2011-10-051-2/+2
|\
| * git-stash: remove untracked/ignored directories when stashedbc/unstash-clean-cruftsBrandon Casey2011-08-271-1/+1
| * git-stash.sh: fix typo in error messageBrandon Casey2011-08-271-1/+1
* | stash: take advantage of eval_gettextlnJon Seymour2011-08-081-6/+3
* | Merge branch 'dc/stash-con-untracked'Junio C Hamano2011-07-221-5/+65
|\ \ | |/
| * stash: Add --include-untracked option to stash and remove all untracked filesDavid Caldwell2011-06-261-4/+64
| * Merge branch 'jk/maint-stash-oob' into maintJunio C Hamano2011-05-041-11/+1
| |\
| * \ Merge branch 'dm/stash-k-i-p' into maintJunio C Hamano2011-05-041-4/+5
| |\ \
* | | | i18n: git-stash drop_stash say/die messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+2
* | | | i18n: git-stash "unknown option" messageÆvar Arnfjörð Bjarmason2011-05-211-2/+13
* | | | i18n: git-stash die + eval_gettext $1 messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+4
* | | | i18n: git-stash die + eval_gettext $* messagesÆvar Arnfjörð Bjarmason2011-05-211-2/+8
* | | | i18n: git-stash die + eval_gettext messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+1
* | | | i18n: git-stash die + gettext messagesÆvar Arnfjörð Bjarmason2011-05-211-18/+18
* | | | i18n: git-stash say + gettext messagesÆvar Arnfjörð Bjarmason2011-05-211-2/+2
* | | | i18n: git-stash echo + gettext messageÆvar Arnfjörð Bjarmason2011-05-211-1/+4
* | | | i18n: git-stash add git-sh-i18nÆvar Arnfjörð Bjarmason2011-05-211-0/+1
* | | | Merge branch 'dm/stash-k-i-p'Junio C Hamano2011-04-271-4/+5
|\ \ \ \ | | |/ / | |/| |
| * | | stash: ensure --no-keep-index and --patch can be used in any orderDan McGee2011-04-071-4/+5
* | | | Merge branch 'jk/maint-stash-oob'Junio C Hamano2011-04-271-11/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|