- 12 5月, 2008 4 次提交
-
-
Add a new option --no-binary to git-format-patch so that no binary changes are included in the generated patches, only notices that those files changed. This generate patches that cannot be applied, but still is useful for generating mails for code review purposes. See also: commit e47f306d, where --binary option was turned on by default. Signed-off-by: NCaio Marcelo de Oliveira Filho <cmarcelo@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Dustin Sallings 提交于
Change cd67e4d4 introduced a new configuration parameter that told pull to automatically perform a rebase instead of a merge. This change provides a configuration option to enable this feature automatically when creating a new branch. If the variable branch.autosetuprebase applies for a branch that's being created, that branch will have branch.<name>.rebase set to true. Signed-off-by: NDustin Sallings <dustin@spy.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Eric Wong 提交于
With this, git svn clone -s http://svn.gnome.org/svn/gtk+ is successful. Also modified the funky rename test for this, which _does_ include escaped '+' signs for HTTP URLs. SVN seems to accept either "+" or "%2B" in filenames and directories (just not the main URL), so I'll leave it alone for now. Signed-off-by: NEric Wong <normalperson@yhbt.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Krzysztof Kowalczyk 提交于
Also fix an underallocation in walker.c::interpret_target(). Signed-off-by: NKrzysztof Kowalczyk <kkowalczyk@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 09 5月, 2008 14 次提交
-
-
由 Junio C Hamano 提交于
* maint: Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" doc: clarify definition of "update" for git-add -u
-
由 Junio C Hamano 提交于
* maint-1.5.4: Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" doc: clarify definition of "update" for git-add -u
-
由 Junio C Hamano 提交于
* 'sg/merge-options' (early part): merge, pull: add '--(no-)log' command line option fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable add 'merge.stat' config variable merge, pull: introduce '--(no-)stat' option doc: moved merge.* config variables into separate merge-config.txt
-
由 Junio C Hamano 提交于
* db/learn-HEAD: Make ls-remote http://... list HEAD, like for git://... Make walker.fetch_ref() take a struct ref.
-
由 Junio C Hamano 提交于
* jn/webfeed: gitweb: Use feed link according to current view
-
由 Junio C Hamano 提交于
* cc/help: documentation: web--browse: add a note about konqueror documentation: help: add info about "man.<tool>.cmd" config var help: use "man.<tool>.cmd" as custom man viewer command documentation: help: add "man.<tool>.path" config variable help: use man viewer path from "man.<tool>.path" config var
-
由 Junio C Hamano 提交于
* dm/cherry-pick-s: Allow cherry-pick (and revert) to add signoff line
-
由 Junio C Hamano 提交于
* lt/dirmatch-optim: Optimize match_pathspec() to avoid fnmatch()
-
由 Johannes Sixt 提交于
Some systems define fopen as a macro based on compiler settings, and unconditionally redefining it triggers a compilation warning.
-
由 Brandon Casey 提交于
Some systems define fopen as a macro based on compiler settings. The previous technique for reverting to the system fopen function by merely undefining fopen is inadequate in this case. Instead, avoid defining fopen entirely when compiling this source file. Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Tested-by: NMike Ralphson <mike@abacus.co.uk> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Dustin Sallings 提交于
Signed-off-by: NDustin Sallings <dustin@spy.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
The "-u" option is described only in terms of "updating" files, which in turn is described only as "similar to what git commit -a does". Let's be a little more specific about what updating entails. Suggested by Geoffrey Irving. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Christian Couder 提交于
Before this patch, there were no "git bisect run" example. Signed-off-by: NChristian Couder <chriscool@tuxfamily.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Gustaf Hendeby 提交于
The 'git gui' has a number of options that can be specified using the options dialog. Sometimes it is convenient to be able to specify these from the command line, therefor document these options. Signed-off-by: NGustaf Hendeby <hendeby@isy.liu.se> Acked-by: NShawn O. Pearce <speace@spearce.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 07 5月, 2008 2 次提交
-
-
由 Christian Couder 提交于
Before this patch in "git-add.txt" and "git-format-patch.txt", the commands used in the examples were "git-CMD" instead of "git CMD". This patch fixes that. In "git-pull.txt" only the last example had the code sample in an asciidoc "Listing Block", and in the other two files, none. This patch fixes that by putting all code samples in listing blocks. Signed-off-by: NChristian Couder <chriscool@tuxfamily.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Mark Hills 提交于
Honour the setgid and umask when re-creating the objects directory at the destination. cpio in copy-pass mode aims to copy file permissions which causes this problem and cannot be disabled. Be explicit by copying the directory structure first, honouring the permissions at the destination, then copy the files with 0444 permissions. This also avoids bugs in some versions of cpio. Signed-off-by: NMark Hills <mark@pogo.org.uk> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 06 5月, 2008 10 次提交
-
-
由 Junio C Hamano 提交于
* jc/lstat: diff-files: mark an index entry we know is up-to-date as such write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATE
-
由 Junio C Hamano 提交于
* bc/filter-branch: filter-branch.sh: support nearly proper tag name filtering
-
由 Junio C Hamano 提交于
* lh/git-file: Teach GIT-VERSION-GEN about the .git file Teach git-submodule.sh about the .git file Teach resolve_gitlink_ref() about the .git file Add platform-independent .git "symlink"
-
由 Junio C Hamano 提交于
* jk/fetch-status: git-fetch: always show status of non-tracking-ref fetches
-
由 Junio C Hamano 提交于
* lh/branch-merged: Add tests for `branch --[no-]merged` git-branch.txt: compare --contains, --merged and --no-merged git-branch: add support for --merged and --no-merged
-
由 Junio C Hamano 提交于
* pb/remote-mirror-config: Add a remote.*.mirror configuration option
-
由 Jörg Sommer 提交于
Signed-off-by: NJ��rg Sommer <joerg@alea.gnuu.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Gustaf Hendeby 提交于
Signed-off-by: NGustaf Hendeby <hendeby@isy.liu.se> Acked-by: NEric Wong <normalperson@yhbt.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Gustaf Hendeby 提交于
When having a svn:ignore that ignores the .gitignore file the -f option to git add must be used to avoid git complaining about adding an ignored file and hence stop the process of creating .gitignores. Signed-off-by: NGustaf Hendeby <hendeby@isy.liu.se> Acked-by: NEric Wong <normalperson@yhbt.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Miklos Vajna 提交于
In recent versions GNU's git has been renamed to gnuit, document this while talking about how to resolve the conflict. Signed-off-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 5月, 2008 8 次提交
-
-
由 Heikki Orsila 提交于
Signed-off-by: NHeikki Orsila <heikki.orsila@iki.fi> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: checkout: don't rfc2047-encode oneline on detached HEAD filter-branch: Documentation fix.
-
由 Junio C Hamano 提交于
* maint-1.5.4: filter-branch: Documentation fix.
-
由 Jeff King 提交于
When calling pretty_print_commit, there is an implicit assumption that passing in a non-NULL "subject" variable for oneline or email formats means that the output is part of a subject and therefore "subject" to rfc2047 encoding. This is not the desired effect when reporting the movement of detached HEAD. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Christian Couder 提交于
Signed-off-by: NChristian Couder <chriscool@tuxfamily.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Florian Ragwitz 提交于
It's --msg-filter, not --message-filter. Signed-off-by: NFlorian Ragwitz <rafl@debian.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Adam Simpkins 提交于
This eliminates a special case in the show_log() function, to help simplify the terminator semantics. Now show_log() always prints a newline after the log entry when use_terminator is set, even if the log message is empty. This change should only affect the --pretty=tformat output, since that was the only way to trigger this special case. Signed-off-by: NAdam Simpkins <adam@adamsimpkins.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Adam Simpkins 提交于
These variables were made unnecessary by commit 3969cf7d. Signed-off-by: NAdam Simpkins <adam@adamsimpkins.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 01 5月, 2008 2 次提交
-
-
由 Stephen R. van den Berg 提交于
When using git-cvsimport, the author is inferred from the cvs commit, e.g. cvs commit logname is foobaruser, then the author field in git results in: Author: foobaruser <foobaruser> Which is not perfect, but perfectly acceptable given the circumstances. The default git-svn import however, results in: Author: foobaruser <foobaruser@acf43c95-373e-0410-b603-e72c3f656dc1> When using mixes of imports, from CVS and SVN into the same git repository, you'd like to harmonise the imports to the format cvsimport uses. git-svn supports an experimental option --use-log-author which currently results in the same logentry as without that option when no From: or Signed-off-by: is found in the logentry ($email currently ends up empty, and hence is generated again). This patches harmonises the result with cvsimport, and makes git-svn --use-log-author produce: Author: foobaruser <foobaruser> Signed-off-by: NStephen R. van den Berg <srb@cuci.nl> Acked-by: NEric Wong <normalperson@yhbt.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: fetch-pack: brown paper bag fix
-