Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NMarc Branchaud <marcnarc@xiplink.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Ralf reported that '--recurse-submodules' option in push.c should not be
translated [1].  Before his commit is merged, remove superfluous
translations for push.c.

[1] http://www.spinics.net/lists/git/msg241964.htmlSigned-off-by: NJiang Xin <worldhello.net@gmail.com>

Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Signed-off-by: NPhillip Sz <phillip.szelat@gmail.com>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

In order to catch up with the release of Git 2.2.0 final, make a batch
l10n update for the new l10n change brought by commit d52adf1f (trailer:
display a trailer without its trailing newline).
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Generate po/git.pot from v2.2.0-rc2-23-gca0107e2 for git v2.2.0 l10n
round 2.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* sv/submitting-final-patch:
  SubmittingPatches: final submission is To: maintainer and CC: list

* sn/tutorial-status-output-example:
  gittutorial: fix output of 'git status'

* mh/doc-remote-helper-xref:
  doc: add some crossrefs between manual pages

* tb/no-relative-file-url:
  t5705: the file:// URL should be absolute

Small fixes to a new experimental command already in 'master'.

* cc/interpret-trailers:
  trailer: display a trailer without its trailing newline
  trailer: ignore comment lines inside the trailers

* 'master' of git://github.com/git-l10n/git-po:
  l10n: Update Catalan translation

* jc/doc-commit-only:
  Documentation/git-commit: clarify that --only/--include records the working tree contents

* ta/tutorial-modernize:
  gittutorial.txt: remove reference to ancient Git version

Fix-up to a new feature in 'master'.

* da/difftool:
  difftool: honor --trust-exit-code for builtin tools

Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>

* 'master' of git://github.com/git-l10n/git-po:
  l10n: de.po: translate 62 new messages
  l10n: de.po: Fixup one translation
  l10n: de.po: use imperative form for command options

Translate 62 new messages came from git.pot update in 16742b0
(l10n: git.pot: proposed updates for v2.2.0 (+62)).
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

English grammar with German words doesn't make it a German translation. ;)
Signed-off-by: NStefan Beller <stefanbeller@gmail.com>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

run_merge_tool() was not setting $status, which prevented the
exit code for builtin tools from being forwarded to the caller.

Capture the exit status and add a test to guarantee the behavior.
Reported-by: NAdria Farres <14farresa@gmail.com>
Signed-off-by: NDavid Aguilar <davvid@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

'git status' doesn't output leading '#'s these days.
Signed-off-by: NStefan Naewe <stefan.naewe@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The test misused a URL "file://." to mean "relative to here",
which we no longer accept.

In a file:// URL, typically there is no host, and RFC1738 says that
file:///<path> should be used.

Update t5705 to use a working URL.
Reported-by: NMichael Blume <blume.mike@gmail.com>
Signed-off-by: NTorsten Bögershausen <tboegi@web.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

In an earlier part there is:

  "re-send it with "To:" set to the maintainer [*1*] and "cc:" the list [*2*]"

for the final submission, but later we see

  "Send it to the list and cc the maintainer."

Fix the later one to match the previous.
Signed-off-by: NSlavomir Vlcek <svlc@inventati.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* nd/gitignore-trailing-whitespace:
  gitignore.txt: fix spelling of "backslash"

Fix-up a test for portability.

* jk/fetch-reflog-df-conflict:
  t1410: fix breakage on case-insensitive filesystems

In particular, git-fast-import and -export link to each
other, and gitremote-helpers links to existing remote
helpers, and vice versa. Also link to fast-import from the
remote helper spec, as this is relevant for remote helpers
using the fast-import format.
Signed-off-by: NMax Horn <max@quendi.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NThomas Ackermann <th.acker@arcor.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:

* rs/clean-menu-item-defn:
  clean: use f(void) instead of f() to declare a pointer to a function without arguments

Explicitly declare that git_atexit_dispatch() and git_atexit_clear()
take no parameters instead of leaving their parameter list empty and
thus unspecified.
Signed-off-by: NRene Scharfe <l.s.r@web.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* 'master' of git://github.com/git-l10n/git-po:
  l10n: Updated Bulgarian translation of git (2296t,0f,0u)
  l10n: zh_CN: translations for git v2.2.0-rc0
  l10n: sv.po: Update Swedish translation (2296t0f0u)
  l10n: fr.po (2296t) update for version 2.2.0
  l10n: vi.po: Update new message strings
  l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)

* maint:
  Documentation/config.txt: fix minor typo
  config.txt: fix typo

* js/diff-highlight-avoid-sigpipe:
  diff-highlight: exit when a pipe is broken