- 16 11月, 2009 7 次提交
-
-
由 Junio C Hamano 提交于
* js/maint-diff-color-words: diff --color-words: bit of clean-up diff --color-words -U0: fix the location of hunk headers t4034-diff-words: add a test for word diff without context Conflicts: diff.c
-
由 Junio C Hamano 提交于
* rs/pretty-wrap: log --format: don't ignore %w() at the start of format string Implement wrap format %w() as if it is a mode switch Conflicts: pretty.c
-
由 Junio C Hamano 提交于
* js/log-rewrap: Teach --wrap to only indent without wrapping Add strbuf_add_wrapped_text() to utf8.[ch] print_wrapped_text(): allow hard newlines
-
由 Junio C Hamano 提交于
* fc/doc-fast-forward: Use 'fast-forward' all over the place Conflicts: builtin-merge.c
-
由 Junio C Hamano 提交于
* sc/difftool-p4merge: mergetool--lib: add p4merge as a pre-configured mergetool option
-
由 Junio C Hamano 提交于
* jk/maint-add-p-empty: add-interactive: handle deletion of empty files
-
由 Junio C Hamano 提交于
* lt/revision-bisect: Add '--bisect' revision machinery argument
-
- 15 11月, 2009 2 次提交
-
-
由 Junio C Hamano 提交于
* maint: git-add.txt: fix formatting of --patch section
-
由 Björn Gustavsson 提交于
Signed-off-by: NBjörn Gustavsson <bgustavsson@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 14 11月, 2009 1 次提交
-
-
由 Stephen Boyd 提交于
Extra paragraphs should be prefixed with a plus sign. Signed-off-by: NStephen Boyd <bebarino@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 11 11月, 2009 17 次提交
-
-
由 Junio C Hamano 提交于
* maint: check-ref-format -h: it does not know the --print option yet ... but it does on the 'master' branch.
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
A multi-line SYNOPSIS description must be marked as [verse] Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: merge: do not setup worktree twice check-ref-format: update usage string Conflicts: builtin-check-ref-format.c
-
由 Junio C Hamano 提交于
* jk/maint-format-patch-p-suppress-stat: format-patch: make "-p" suppress diffstat
-
由 Junio C Hamano 提交于
* pb/maint-gitweb-blob-lineno: gitweb: Fix blob linenr links in pathinfo mode
-
由 Junio C Hamano 提交于
* tr/describe-advice: describe: when failing, tell the user about options that work
-
由 Junio C Hamano 提交于
* jk/maint-1.6.3-ls-files-i: ls-files: unbreak "ls-files -i"
-
由 Junio C Hamano 提交于
* bg/merge-ff-only: Teach 'git merge' and 'git pull' the option --ff-only
-
由 Junio C Hamano 提交于
* vl/maint-openssl-signature-change: imap-send.c: fix compiler warnings for OpenSSL 1.0
-
由 Junio C Hamano 提交于
* jk/maint-push-config: push: always load default config
-
由 Junio C Hamano 提交于
* jk/gitignore-anchored: gitignore: root most patterns at the top-level directory Conflicts: .gitignore
-
由 Junio C Hamano 提交于
* jp/dirty-describe: Teach "git describe" --dirty option
-
由 Junio C Hamano 提交于
* sr/blame-incomplete: blame: make sure that the last line ends in an LF
-
由 Jonathan Nieder 提交于
Builtins do not need to run setup_worktree() for themselves, since the builtin machinery runs it for them. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jonathan Nieder 提交于
'git check-ref-format' has learned --branch and --print options since the usage string was last updated. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Štěpán Němec 提交于
Add the description next to --assume-unchanged because this option is only useful in a special case of using that option. Signed-off-by: NŠtěpán Němec <stepnem@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 09 11月, 2009 4 次提交
-
-
由 Junio C Hamano 提交于
* maint: Add intermediate build products to .gitignore
-
由 Jonathan Nieder 提交于
Temporaries such as configure.ac+ and Documentation/*.xml+ sometimes remain after an interrupted build. Tell git not to track them. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
Once upon a time, format-patch would use its default stat plus patch format only when no diff format was given on the command line. This meant that "format-patch -p" would suppress the stat and show just the patch. Commit 68daa64d changed this to keep the stat format when we had an "implicit" patch format, like "-U5". As a side effect, this meant that an explicit patch format was now ignored (because cmd_format_patch didn't know the reason that the format was set way down in diff_opt_parse). This patch unbreaks what 68daa64d did (while still preserving what 68daa64d was trying to do), reinstating "-p" to suppress the default behavior. We do this by parsing "-p" ourselves in format-patch, and noting whether it was used explicitly. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 René Scharfe 提交于
This fixes e.g. --format='%w(72)%s'. Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 07 11月, 2009 3 次提交
-
-
由 Junio C Hamano 提交于
* jc/commit-s-subject-is-not-a-footer: builtin-commit.c: fix logic to omit empty line before existing footers
-
由 Junio C Hamano 提交于
"commit -s" used to add an empty line before adding S-o-b line only when the last line of the existing log message is not another S-o-b line, but c1e01b0c (commit: More generous accepting of RFC-2822 footer lines., 2009-10-28) introduced logic to omit this empty line when the message ends with a run of "footer" lines, to cover S-o-b's friends, e.g. Acked-by. However, the logic was overzealous and missed one corner case. A message that consists of a single line that begins with Token + colon, it can be mistaken as a S-o-b's friend. We do want an empty line in such a case. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Petr Baudis 提交于
In pathinfo mode, we use <base href> that refers to the base location of gitweb in order for various external media links to work well. However, this means that for the page to refer to itself, it must regenerate full link, and this is exactly what the blob view page did not do for line numbers. Signed-off-by: NPetr Baudis <pasky@suse.cz> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 06 11月, 2009 1 次提交
-
-
由 Nicolas Pitre 提交于
Let's keep thread stuff close together if possible. And in this case, this even reduces the #ifdef noise, and allows for skipping the autodetection altogether if delta search is not needed (like with a pure clone). Signed-off-by: NNicolas Pitre <nico@fluxnic.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 05 11月, 2009 2 次提交
-
-
由 Junio C Hamano 提交于
* maint: Fix documentation grammar typo Allow curl helper to work without a local repository Require a struct remote in transport_get()
-
由 Gisle Aas 提交于
Introduced in 492cf3f7 (More precise description of 'git describe --abbrev', 2009-10-29) Signed-off-by: NGisle Aas <gisle@aas.no> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 11月, 2009 2 次提交
-
-
由 Daniel Barkalow 提交于
It's okay to use the curl helper without a local repository, so long as you don't use "fetch". There aren't any git programs that would try to use it, and it doesn't make sense to try it (since there's nowhere to write the results), but we may as well be clear. Signed-off-by: NDaniel Barkalow <barkalow@iabervon.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Daniel Barkalow 提交于
cmd_ls_remote() was calling transport_get() with a NULL remote and a non-NULL url in the case where it was run outside a git repository. This involved a bunch of ill-tested special cases. Instead, simply get the struct remote for the URL with remote_get(), which works fine outside a git repository, and can also take global options into account. This fixes a tiny and obscure bug where "git ls-remote" without a repo didn't support global url.*.insteadOf, even though "git clone" and "git ls-remote" in any repo did. Also, enforce that all callers provide a struct remote to transport_get(). Signed-off-by: NDaniel Barkalow <barkalow@iabervon.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 03 11月, 2009 1 次提交
-
-
由 Junio C Hamano 提交于
* jn/show-normalized-refs: t1402: Make test executable
-