git/contrib, branch v1.8.2.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v1.8.2.22013-04-26T18:12:30ZMerge branch 'fc/untracked-zsh-prompt' into maint2013-04-26T18:12:30ZJunio C Hamanogitster@pobox.com2013-04-26T18:12:30Zurn:sha1:1a475c4a2f4fead39b4e80dcdfbcf0627dfb5327
* fc/untracked-zsh-prompt:
prompt: fix untracked files for zsh
test-hg-hg-git.sh: do not use export X=Y2013-04-26T16:53:52ZTorsten Bögershausentboegi@web.de2013-04-26T09:17:43Zurn:sha1:86c5e148c9100634f0714e61ac85f90f409e12c7
The shell syntax "export X=Y" is not understood by all shells.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
test-hg-bidi.sh: do not use export X=Y2013-04-26T16:53:31ZTorsten Bögershausentboegi@web.de2013-04-26T09:17:56Zurn:sha1:93cd8d970b327e916b6a0eca6377fd357d05b15c
The shell syntax "export X=Y A=B" is not understood by all shells.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: remove duplicate block for "git commit -c"2013-04-24T23:05:07ZMårten Kongstadmarten.kongstad@gmail.com2013-04-24T20:49:06Zurn:sha1:7612e61e33981f48f212f6aefe3550ac724d6208
Remove one of two consecutive, identical blocks for "git commit -c".
This was caused by a mechanical mismerge at d931e2fb252e (Merge
branch 'mp/complete-paths', 2013-02-08). The side branch wanted to
add this block at fea16b47 but the same fix was done independently
at 685397585 already.
Signed-off-by: Mårten Kongstad <marten.kongstad@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'rr/prompt-revert-head' into maint2013-04-22T18:26:54ZJunio C Hamanogitster@pobox.com2013-04-22T18:26:54Zurn:sha1:ad62fd0c2c00aa0cf991d6060cbb13bdd7727319
* rr/prompt-revert-head:
bash: teach __git_ps1 about REVERT_HEAD
prompt: fix untracked files for zsh2013-04-22T01:01:37ZFelipe Contrerasfelipe.contreras@gmail.com2013-04-21T22:00:16Zurn:sha1:24b6132e571bf2e27536d42022f8c0733034d880
We signal presense of untracked files by adding a per-cent sign '%'
to the prompt. But because '%' is used as an escape character to
introduce prompt customization in zsh (just like bash prompt uses
'\' to escape '\u', '\h', etc.), we need to say '%%' to get a
literal per-cent.
Helped-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
remote-hg: fix commit messages2013-04-18T06:41:25ZFelipe Contrerasfelipe.contreras@gmail.com2013-04-18T06:06:31Zurn:sha1:845241d5446c6c4be70fcaa9f7b605e7c6760181
git fast-import expects an extra newline after the commit message data,
but we are adding it only on hg-git compat mode, which is why the
bidirectionality tests pass.
We should add it unconditionally.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/subtree: fix spelling of accidentally2013-04-12T19:23:12ZStefano Lattarinistefano.lattarini@gmail.com2013-04-11T22:36:10Zurn:sha1:d0008b3c667d3496cc1c27161fcbcd7e40aa9d02
Noticed with Lucas De Marchi's codespell tool.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-remote-mediawiki: spelling fixes2013-04-12T19:13:05ZStefano Lattarinistefano.lattarini@gmail.com2013-04-11T22:36:10Zurn:sha1:2582ab18e4b6bf7e56f7931a65b5f2e05e37c18a
Most of these were found using Lucas De Marchi's codespell tool.
Others were pointed out by Eric Sunshine.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 1.8.1.62013-04-07T20:17:50ZJunio C Hamanogitster@pobox.com2013-04-07T16:10:11Zurn:sha1:6466fbbeef67ec398f6f5d5b5da5d6f107a647b2