Skip to content

Commit

Permalink
Merge pull request progit#916 from sauerc/master
Browse files Browse the repository at this point in the history
Fix git stash-unapply example
  • Loading branch information
schacon committed Oct 22, 2014
2 parents bfb01fa 7192c26 commit 18e1d1e
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion az/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 501,7 @@ Again, if you don’t specify a stash, Git assumes the most recent stash:
You may want to create an alias and effectively add a `stash-unapply` command to your git. For example:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion cs/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 518,7 @@ Jestliže nespecifikujete konkrétní odklad, Git předpokládá odklad posledn
Můžete si také vytvořit alias a do svého gitu přidat například příkaz `stash-unapply`:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion de/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 660,7 @@ An dieser Stelle noch einmal der Hinweis, dass Git den zuletzt erstellten Stash
Wenn Du dieses Feature öfters benötigst, ist es wahrscheinlich sinnvoll, einen Alias `stash-unapply` in Git dafür anzulegen:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion en/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 501,7 @@ Again, if you don’t specify a stash, Git assumes the most recent stash:
You may want to create an alias and effectively add a `stash-unapply` command to your Git. For example:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion fr/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 577,7 @@ La création d'un alias permettra d'ajouter effectivement la commande `stash-una
Par exemple :

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion it/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 501,7 @@ Di nuovo, se non specifichi un accantonamento, Git assume che sia l'ultimo:
Puoi voler creare un alias per avere un comando `stash-unapply` nel tuo Git. Per esempio:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion ja/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 496,7 @@ apply オプションは、スタックに隠した作業を再度適用する
次の例のようにエイリアスを作れば、Git に `stash-unapply` コマンドを追加したのと事実上同じことになります。

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... 何か作業をして ...
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion ko/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 497,7 @@ Stash를 명시하지 않으면 Git은 가장 최근의 Stash를 사용한다:
`stash-unapply`라는 alias를 만들고 편리하게 할 수도 있다:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion nl/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 538,7 @@ Nogmaals: als je geen stash specificeert gaat Git van de meest recente stash uit
Wellicht wil je een alias maken en effectief een `stash-unapply` commando aan je Git toevoegen. Bijvoorbeeld:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion no-nb/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 501,7 @@ Again, if you don’t specify a stash, Git assumes the most recent stash:
You may want to create an alias and effectively add a `stash-unapply` command to your Git. For example:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion pl/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 683,7 @@ Możesz chcieć stworzyć alias i dodać komendę `stash-unapply` do Gita. Na pr
<!-- You may want to create an alias and effectively add a `stash-unapply` command to your git. For example: -->

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion pt-br/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 497,7 @@ Novamente, se você não especificar um stash, Git assume que é o stash mais re
Você pode querer criar um alias e adicionar explicitamente um comando `stash-unapply` no seu git. Por exemplo:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion ru/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 501,7 @@ Insert 18333fig0601.png
Если хотите, сделайте псевдоним и добавьте в свой Git команду `stash-unapply`. Например, так:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion zh-tw/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 500,7 @@ apply 選項只嘗試應用儲藏的工作——儲藏的內容仍然在堆疊
你可能會想要新建一個別名,在你的 git 增加一個 `stash-unapply` 命令,這樣更有效率。例如:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down
2 changes: 1 addition & 1 deletion zh/06-git-tools/01-chapter6.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 500,7 @@ apply 选项只尝试应用储藏的工作——储藏的内容仍然在栈上
你可能会想要新建一个別名,在你的 Git 里增加一个 `stash-unapply` 命令,这样更有效率。例如:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash
$ git stash apply
$ #... work work work
$ git stash-unapply

Expand Down

0 comments on commit 18e1d1e

Please sign in to comment.