summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-11-15Merge branch 'sc/difftool-p4merge'Libravatar Junio C Hamano5-6/+19
* sc/difftool-p4merge: mergetool--lib: add p4merge as a pre-configured mergetool option
2009-11-15Merge branch 'jk/maint-add-p-empty'Libravatar Junio C Hamano2-5/+30
* jk/maint-add-p-empty: add-interactive: handle deletion of empty files
2009-11-15Merge branch 'lt/revision-bisect'Libravatar Junio C Hamano4-1/+32
* lt/revision-bisect: Add '--bisect' revision machinery argument
2009-11-15Merge branch 'maint'Libravatar Junio C Hamano1-4/+4
* maint: git-add.txt: fix formatting of --patch section
2009-11-14bash: add the merge option --ff-onlyLibravatar Björn Gustavsson1-1/+1
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-14git-add.txt: fix formatting of --patch sectionLibravatar Stephen Boyd1-4/+4
Extra paragraphs should be prefixed with a plus sign. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-10Merge branch 'maint'Libravatar Junio C Hamano0-0/+0
* maint: check-ref-format -h: it does not know the --print option yet ... but it does on the 'master' branch.
2009-11-10check-ref-format -h: it does not know the --print option yetLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-10git-describe.txt: formatting fixLibravatar Junio C Hamano1-0/+1
A multi-line SYNOPSIS description must be marked as [verse] Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-10Merge branch 'maint'Libravatar Junio C Hamano2-2/+5
* maint: merge: do not setup worktree twice check-ref-format: update usage string Conflicts: builtin-check-ref-format.c
2009-11-10Merge branch 'jk/maint-format-patch-p-suppress-stat'Libravatar Junio C Hamano2-2/+28
* jk/maint-format-patch-p-suppress-stat: format-patch: make "-p" suppress diffstat
2009-11-10Merge branch 'pb/maint-gitweb-blob-lineno'Libravatar Junio C Hamano1-1/+2
* pb/maint-gitweb-blob-lineno: gitweb: Fix blob linenr links in pathinfo mode
2009-11-10Merge branch 'tr/describe-advice'Libravatar Junio C Hamano1-4/+12
* tr/describe-advice: describe: when failing, tell the user about options that work
2009-11-10Merge branch 'jk/maint-1.6.3-ls-files-i'Libravatar Junio C Hamano3-2/+20
* jk/maint-1.6.3-ls-files-i: ls-files: unbreak "ls-files -i"
2009-11-10Merge branch 'bg/merge-ff-only'Libravatar Junio C Hamano4-3/+61
* bg/merge-ff-only: Teach 'git merge' and 'git pull' the option --ff-only
2009-11-10Merge branch 'vl/maint-openssl-signature-change'Libravatar Junio C Hamano1-0/+4
* vl/maint-openssl-signature-change: imap-send.c: fix compiler warnings for OpenSSL 1.0
2009-11-10Merge branch 'jk/maint-push-config'Libravatar Junio C Hamano1-2/+1
* jk/maint-push-config: push: always load default config
2009-11-10Merge branch 'jk/gitignore-anchored'Libravatar Junio C Hamano1-177/+177
* jk/gitignore-anchored: gitignore: root most patterns at the top-level directory Conflicts: .gitignore
2009-11-10Merge branch 'jp/dirty-describe'Libravatar Junio C Hamano3-1/+44
* jp/dirty-describe: Teach "git describe" --dirty option
2009-11-10Merge branch 'sr/blame-incomplete'Libravatar Junio C Hamano1-0/+6
* sr/blame-incomplete: blame: make sure that the last line ends in an LF
2009-11-10merge: do not setup worktree twiceLibravatar Jonathan Nieder1-1/+0
Builtins do not need to run setup_worktree() for themselves, since the builtin machinery runs it for them. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-10check-ref-format: update usage stringLibravatar Jonathan Nieder1-1/+5
'git check-ref-format' has learned --branch and --print options since the usage string was last updated. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-10git-update-index.txt: Document the --really-refresh option.Libravatar Štěpán Němec1-1/+5
Add the description next to --assume-unchanged because this option is only useful in a special case of using that option. Signed-off-by: Štěpán Němec <stepnem@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-08Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
* maint: Add intermediate build products to .gitignore
2009-11-08Add intermediate build products to .gitignoreLibravatar Jonathan Nieder1-0/+1
Temporaries such as configure.ac+ and Documentation/*.xml+ sometimes remain after an interrupted build. Tell git not to track them. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-08format-patch: make "-p" suppress diffstatLibravatar Jeff King2-2/+28
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 68daa64 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 68daa64 did (while still preserving what 68daa64 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: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-06Merge branch 'jc/commit-s-subject-is-not-a-footer'Libravatar Junio C Hamano2-1/+10
* jc/commit-s-subject-is-not-a-footer: builtin-commit.c: fix logic to omit empty line before existing footers
2009-11-06builtin-commit.c: fix logic to omit empty line before existing footersLibravatar Junio C Hamano2-1/+10
"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 c1e01b0 (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: Junio C Hamano <gitster@pobox.com>
2009-11-06gitweb: Fix blob linenr links in pathinfo modeLibravatar Petr Baudis1-1/+2
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: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-05pack-objects: move thread autodetection closer to relevant codeLibravatar Nicolas Pitre1-5/+2
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: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-04Merge branch 'maint'Libravatar Junio C Hamano4-7/+13
* maint: Fix documentation grammar typo Allow curl helper to work without a local repository Require a struct remote in transport_get()
2009-11-04Fix documentation grammar typoLibravatar Gisle Aas1-1/+1
Introduced in 492cf3f (More precise description of 'git describe --abbrev', 2009-10-29) Signed-off-by: Gisle Aas <gisle@aas.no> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-03Allow curl helper to work without a local repositoryLibravatar Daniel Barkalow1-1/+4
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: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-03Require a struct remote in transport_get()Libravatar Daniel Barkalow2-5/+8
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: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-02Merge branch 'jn/show-normalized-refs'Libravatar Junio C Hamano1-0/+0
* jn/show-normalized-refs: t1402: Make test executable
2009-11-02t1402: Make test executableLibravatar Stephen Boyd1-0/+0
Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-01Merge branch 'bg/clone-doc' into maintLibravatar Junio C Hamano1-13/+13
* bg/clone-doc: git-clone.txt: Fix grammar and formatting
2009-11-01Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
* maint: Makefile: add compat/bswap.h to LIB_H
2009-11-01Makefile: add compat/bswap.h to LIB_HLibravatar Dmitry V. Levin1-0/+1
Starting with commit 51ea55190b6e72c77c96754c1bf2f149a4714848, git-compat-util.h includes compat/bswap.h Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-31imap-send.c: fix compiler warnings for OpenSSL 1.0Libravatar Vietor Liu1-0/+4
The openssl/CHANGES file says: Let the TLSv1_method() etc. functions return a 'const' SSL_METHOD pointer and make the SSL_METHOD parameter in SSL_CTX_new, SSL_CTX_set_ssl_version and SSL_set_ssl_method 'const'. In older versions, unqualified pointers were used, so we unfortunately cannot unconditionally update the type of the variable we use. Signed-off-by: Vietor Liu <vietor@vxwo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-31Revert "Don't create the $GIT_DIR/branches directory on init"Libravatar Junio C Hamano1-0/+1
This reverts commit 0cc5691a8b05a7eabdeef520c94b1bb3bcac7874. There is not enough justification for doing this. We do not update things in .git/branches and .git/remotes anymore, but still do read information from there and will keep doing so. Besides, this breaks quite a lot of tests in t55?? series.
2009-10-30fixup tr/stash-format mergeLibravatar Junio C Hamano19-79/+192
2009-10-30Merge branch 'js/diff-verbose-submodule'Libravatar Junio C Hamano7-0/+411
* js/diff-verbose-submodule: add tests for git diff --submodule Add the --submodule option to the diff option family
2009-10-30Merge branch 'jc/checkout-auto-track'Libravatar Junio C Hamano3-21/+83
* jc/checkout-auto-track: git checkout --no-guess DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz" check_filename(): make verify_filename() callable without dying
2009-10-30Merge branch 'jn/show-normalized-refs'Libravatar Junio C Hamano3-6/+111
* jn/show-normalized-refs: check-ref-format: simplify --print implementation git check-ref-format --print Add tests for git check-ref-format Conflicts: Documentation/git-check-ref-format.txt
2009-10-30Merge branch 'jc/maint-1.6.3-graft-trailing-space'Libravatar Junio C Hamano1-2/+2
* jc/maint-1.6.3-graft-trailing-space: info/grafts: allow trailing whitespaces at the end of line
2009-10-30Merge branch 'ak/bisect-reset-to-switch'Libravatar Junio C Hamano2-10/+21
* ak/bisect-reset-to-switch: bisect reset: Allow resetting to any commit, not just a branch
2009-10-30Merge branch 'tr/maint-roff-quote'Libravatar Junio C Hamano3-0/+28
* tr/maint-roff-quote: Quote ' as \(aq in manpages
2009-10-30Merge branch 'ja/fetch-doc'Libravatar Junio C Hamano3-67/+76
* ja/fetch-doc: Documentation/merge-options.txt: order options in alphabetical groups Documentation/git-pull.txt: Add subtitles above included option files Documentation/fetch-options.txt: order options alphabetically
2009-10-30Merge branch 'cb/doc-fetch-pull-merge'Libravatar Junio C Hamano3-45/+66
* cb/doc-fetch-pull-merge: modernize fetch/merge/pull examples
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 07:31:23 +0000