- 20 11月, 2014 7 次提交
-
-
由 Jiang Xin 提交于
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>
-
由 Jiang Xin 提交于
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>
-
由 Junio C Hamano 提交于
* sv/submitting-final-patch: SubmittingPatches: final submission is To: maintainer and CC: list
-
由 Junio C Hamano 提交于
* sn/tutorial-status-output-example: gittutorial: fix output of 'git status'
-
由 Junio C Hamano 提交于
* mh/doc-remote-helper-xref: doc: add some crossrefs between manual pages
-
由 Junio C Hamano 提交于
* tb/no-relative-file-url: t5705: the file:// URL should be absolute
-
由 Junio C Hamano 提交于
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
-
- 19 11月, 2014 4 次提交
-
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* 'master' of git://github.com/git-l10n/git-po: l10n: Update Catalan translation
-
由 Junio C Hamano 提交于
* jc/doc-commit-only: Documentation/git-commit: clarify that --only/--include records the working tree contents
-
由 Junio C Hamano 提交于
* ta/tutorial-modernize: gittutorial.txt: remove reference to ancient Git version
-
由 Junio C Hamano 提交于
Fix-up to a new feature in 'master'. * da/difftool: difftool: honor --trust-exit-code for builtin tools
-
- 18 11月, 2014 2 次提交
-
-
由 Alex Henrie 提交于
Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* '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
-
- 16 11月, 2014 2 次提交
-
-
由 Ralf Thielow 提交于
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>
-
由 Stefan Beller 提交于
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>
-
- 15 11月, 2014 3 次提交
-
-
由 David Aguilar 提交于
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>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Ralf Thielow 提交于
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-
- 14 11月, 2014 3 次提交
-
-
由 Stefan Naewe 提交于
'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>
-
由 Torsten Bögershausen 提交于
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>
-
由 Slavomir Vlcek 提交于
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>
-
- 13 11月, 2014 4 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
* nd/gitignore-trailing-whitespace: gitignore.txt: fix spelling of "backslash"
-
由 Junio C Hamano 提交于
Fix-up a test for portability. * jk/fetch-reflog-df-conflict: t1410: fix breakage on case-insensitive filesystems
-
- 12 11月, 2014 4 次提交
-
-
由 Max Horn 提交于
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>
-
由 Thomas Ackermann 提交于
Signed-off-by: NThomas Ackermann <th.acker@arcor.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint:
-
由 Junio C Hamano 提交于
* rs/clean-menu-item-defn: clean: use f(void) instead of f() to declare a pointer to a function without arguments
-
- 11 11月, 2014 10 次提交
-
-
由 René Scharfe 提交于
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>
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* '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)
-
由 Junio C Hamano 提交于
* maint: Documentation/config.txt: fix minor typo config.txt: fix typo
-
由 Junio C Hamano 提交于
* js/diff-highlight-avoid-sigpipe: diff-highlight: exit when a pipe is broken
-
由 Thomas Quinot 提交于
Add a missing article at the beginning of a sentence, and rephrase slightly. Signed-off-by: NThomas Quinot <thomas@quinot.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nicolas Dermine 提交于
Signed-off-by: NNicolas Dermine <nicolas.dermine@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 René Scharfe 提交于
Initialize the struct child_process variable cp at declaration time. This is shorter, saves a function call and prevents using the variable before initialization by mistake. Suggested-by: NJeff King <peff@peff.net> Signed-off-by: NRene Scharfe <l.s.r@web.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Christian Couder 提交于
Trailers passed to the parse_trailer() function often have a trailing newline. When erroring out, we should display the invalid trailer properly, that means without any trailing newline. Helped-by: NJunio C Hamano <gitster@pobox.com> Helped-by: NJeff King <peff@peff.net> Signed-off-by: NChristian Couder <chriscool@tuxfamily.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Christian Couder 提交于
Otherwise trailers that are commented out might be processed. We would also error out if the comment line char is also a separator. This means that comments inside a trailer block will disappear, but that was already the case anyway. Signed-off-by: NChristian Couder <chriscool@tuxfamily.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
Two tests recently added to t1410 create branches "a" and "a/b" to test d/f conflicts on reflogs. Earlier, unrelated tests in that script create the path "A/B" in the working tree. There's no conflict on a case-sensitive filesystem, but on a case-insensitive one, "git log" will complain that "a/b" is both a revision and a working tree path. We could fix this by using a "--" to disambiguate, but we are probably better off using names that are less confusing to make it more clear that they are unrelated to the working tree files. This patch turns "a/b" into "one/two". Reported-by: NMichael Blume <blume.mike@gmail.com> Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 08 11月, 2014 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-