user/sven/git.git/git-stash.sh, branch v1.7.7.4

stash: take advantage of eval_gettextln

2011-08-08T19:05:22Z

Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

Merge branch 'dc/stash-con-untracked'

2011-07-22T21:46:28Z

* dc/stash-con-untracked: stash: Add --include-untracked option to stash and remove all untracked files Conflicts: git-stash.sh

stash: Add --include-untracked option to stash and remove all untracked files

2011-06-26T19:50:46Z

The --include-untracked option acts like the normal "git stash save" but also adds all untracked files in the working directory to the stash and then calls "git clean --force --quiet" to restore the working directory to a pristine state. This is useful for projects that need to run release scripts. With this option, the release scripts can be from the main working directory so one does not have to maintain a "clean" directory in parallel just for releasing. Basically the work-flow becomes: $ git tag release-1.0 $ git stash --include-untracked $ make release $ git clean -f $ git stash pop "git stash" alone is not enough in this case--it leaves untracked files lying around that might mess up a release process that expects everything to be very clean or might let a release succeed that should actually fail (due to a new source file being created that hasn't been committed yet). Signed-off-by: David Caldwell Signed-off-by: Junio C Hamano

i18n: git-stash drop_stash say/die messages

2011-05-21T18:57:17Z

Gettextize the say/die eval_gettext messages in the drop_stash function. Since making these translatable would result in a long line I've wrapped this into two lines. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

i18n: git-stash "unknown option" message

2011-05-21T18:57:17Z

Gettextize the "unknown option for 'stash save'" message that's shown on: $ git stash save --blah-blah error: unknown option for 'stash save': --blah-blah To provide a message, use git stash save -- '--blah-blah' Usage: git stash list [] In a translation the second line should be aligned with the first one. I've added a TRANSLATORS comment to indicate this. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

i18n: git-stash die + eval_gettext $1 messages

2011-05-21T18:57:17Z

Gettextize a messages that used the $1 variable. Since it's subroutine local we have to provide an alias for it for eval_gettext. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

i18n: git-stash die + eval_gettext $* messages

2011-05-21T18:57:17Z

Gettextize messages that used the $* variable. Since it's subroutine local we have to provide an alias for it for eval_gettext. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

i18n: git-stash die + eval_gettext messages

2011-05-21T18:57:17Z

Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

i18n: git-stash die + gettext messages

2011-05-21T18:57:17Z

Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

i18n: git-stash say + gettext messages

2011-05-21T18:57:17Z

Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano