- 01 10月, 2008 17 次提交
-
-
由 Michael Witten 提交于
There is also now a configuration variable: sendemail[.<identity>].validate Signed-off-by: NMichael Witten <mfwitten@mit.edu> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Michael Witten 提交于
Now the man page lists the options in alphabetical order (in terms of the 'main' part of an option's name). Signed-off-by: NMichael Witten <mfwitten@mit.edu> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Michael Witten 提交于
All of the descriptions are aligned, shorter, better arranged, and no line is greater than 78 columns. Signed-off-by: NMichael Witten <mfwitten@mit.edu> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Michael Witten 提交于
Specifically, boolean options are now listed in the form --[no-]option and both forms of documentation now consistently use --[no-]signed-off-by-cc Signed-off-by: NMichael Witten <mfwitten@mit.edu> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Shawn O. Pearce 提交于
* maint: Improve git-log documentation wrt file filters Documentation: remove '\' in front of short options
-
由 martin f. krafft 提交于
The need for "--" in the git-log synopsis was previously unclear and confusing. This patch makes it a little clearer. Thanks to hyy <yiyihu@gmail.com> for his help. [sp: Changed -- to \-- per prior commit e1ccf53a.] Signed-off-by: Nmartin f. krafft <madduck@madduck.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 SZEDER Gábor 提交于
... because they show up in the man and html outputs. This escaping is only needed for double dashes to be compatible with older asciidoc versions; see commit e1ccf53a ([PATCH] Escape asciidoc's built-in em-dash replacement, 2005-09-12). Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Shawn O. Pearce 提交于
* maint: git-svn: call 'fatal' correctly in set-tree Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606) t0024: add executable permission
-
由 Luc Heinrich 提交于
When doing a set-tree and there is no revision to commit to, the following unrelated error message is displayed: "Undefined subroutine &Git::SVN::fatal called at /opt/local/libexec/git-core/git-svn line 2575." The following patch fixes the problem and allows the real error message to be shown. Signed-off-by: NLuc Heinrich <luc@honk-honk.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Michael Prokop 提交于
foo.org is an existing domain, use RFC 2606 complying example.com instead as used in other docs as well. Signed-off-by: NMichael Prokop <mika@grml.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Brandon Casey 提交于
Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 David Bryson 提交于
Signed-off-by: NDavid Bryson <david@statichacks.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Jeff King 提交于
We try to avoid using the "-q" or "-e" options, as they are largely useless, as explained in aadbe44f. There is one exception for "-e" here, which is in t7701 used to produce an "or" of patterns. This can be rewritten as an egrep pattern. This patch also removes use of "grep -F" in favor of the more widely available "fgrep". [sp: Tested on AIX 5.3 by Mike Ralphson, Tested on MinGW by Johannes Sixt] Signed-off-by: NJeff King <peff@peff.net> Tested-by: NMike Ralphson <mike@abacus.co.uk> Tested-by: NJohannes Sixt <johannes.sixt@telecom.at> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Jonathan del Strother 提交于
Signed-off-by: NJonathan del Strother <jon.delStrother@bestbefore.tv> Acked-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 SZEDER Gábor 提交于
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Ralf Wildenhues 提交于
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 SZEDER Gábor 提交于
As of version 7.2, vim ships with its own syntax highlighting for git commit messages, which is: 1. more comprehensive in splitting up the various components of the file 2. in accordance with the usual vim behavior for syntax highlighting (e.g., respecting b:current_syntax) 3. presumably better maintained (I have not been using what's in git's contrib/ directory for some time in favor of the upstream version) Furthermore, vim upsream also provides syntax highlighting for other git filetypes (gitconfig, rebase, send-email). This patch gets rid of our local version and just points interested parties to the upstream version. The code for auto-detecting filetypes is taken from vim's runtime/filetype.vim. Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de> Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 30 9月, 2008 7 次提交
-
-
由 Shawn O. Pearce 提交于
* bc/master-diff-hunk-header-fix: Clarify commit error message for unmerged files Use strchrnul() instead of strchr() plus manual workaround Use remove_path from dir.c instead of own implementation Add remove_path: a function to remove as much as possible of a path git-submodule: Fix "Unable to checkout" for the initial 'update' Clarify how the user can satisfy stash's 'dirty state' check. t4018-diff-funcname: test syntax of builtin xfuncname patterns t4018-diff-funcname: test syntax of builtin xfuncname patterns make "git remote" report multiple URLs diff hunk pattern: fix misconverted "\{" tex macro introducers diff: fix "multiple regexp" semantics to find hunk header comment diff: use extended regexp to find hunk headers diff: use extended regexp to find hunk headers diff.*.xfuncname which uses "extended" regex's for hunk header selection diff.c: associate a flag with each pattern and use it for compiling regex diff.c: return pattern entry pointer rather than just the hunk header pattern Conflicts: builtin-merge-recursive.c t/t7201-co.sh xdiff-interface.h
-
由 Shawn O. Pearce 提交于
* maint: (41 commits) Clarify commit error message for unmerged files Use strchrnul() instead of strchr() plus manual workaround Use remove_path from dir.c instead of own implementation Add remove_path: a function to remove as much as possible of a path git-submodule: Fix "Unable to checkout" for the initial 'update' Clarify how the user can satisfy stash's 'dirty state' check. Remove empty directories in recursive merge Documentation: clarify the details of overriding LESS via core.pager Update release notes for 1.6.0.3 checkout: Do not show local changes when in quiet mode for-each-ref: Fix --format=%(subject) for log message without newlines git-stash.sh: don't default to refs/stash if invalid ref supplied maint: check return of split_cmdline to avoid bad config strings builtin-prune.c: prune temporary packs in <object_dir>/pack directory Do not perform cross-directory renames when creating packs Use dashless git commands in setgitperms.perl git-remote: do not use user input in a printf format string make "git remote" report multiple URLs Start draft release notes for 1.6.0.3 git-repack uses --no-repack-object, not --no-repack-delta. ... Conflicts: RelNotes
-
由 Shawn O. Pearce 提交于
* bc/maint-diff-hunk-header-fix: t4018-diff-funcname: test syntax of builtin xfuncname patterns diff hunk pattern: fix misconverted "\{" tex macro introducers diff: use extended regexp to find hunk headers diff.*.xfuncname which uses "extended" regex's for hunk header selection diff.c: associate a flag with each pattern and use it for compiling regex diff.c: return pattern entry pointer rather than just the hunk header pattern Conflicts: Documentation/gitattributes.txt
-
由 Shawn O. Pearce 提交于
* jc/better-conflict-resolution: Fix AsciiDoc errors in merge documentation git-merge documentation: describe how conflict is presented checkout --conflict=<style>: recreate merge in a non-default style checkout -m: recreate merge when checking out of unmerged index git-merge-recursive: learn to honor merge.conflictstyle merge.conflictstyle: choose between "merge" and "diff3 -m" styles rerere: understand "diff3 -m" style conflicts with the original rerere.c: use symbolic constants to keep track of parsing states xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less xmerge.c: minimum readability fixups xdiff-merge: optionally show conflicts in "diff3 -m" style xdl_fill_merge_buffer(): separate out a too deeply nested function checkout --ours/--theirs: allow checking out one side of a conflicting merge checkout -f: allow ignoring unmerged paths when checking out of the index Conflicts: Documentation/git-checkout.txt builtin-checkout.c builtin-merge-recursive.c t/t7201-co.sh
-
由 Shawn O. Pearce 提交于
* mg/maint-remote-fix: make "git remote" report multiple URLs
-
由 Nanako Shiraishi 提交于
This script takes a range of commits (e.g. maint..next) as its arguments, recreates merge commits in the range to prime rr-cache database. Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Rafael Garcia-Suarez 提交于
Currently, trying to use git-commit with unmerged files in the index will show the message "Error building trees", which can be a bit obscure to the end user. This patch makes the error message clearer, and consistent with what git-write-tree reports in a similar situation. Signed-off-by: NRafael Garcia-Suarez <rgarciasuarez@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 29 9月, 2008 8 次提交
-
-
由 Johan Herland 提交于
Also gets rid of a C++ comment. Signed-off-by: NJohan Herland <johan@herland.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Dmitry Potapov 提交于
The field device is not used by Git, and putting the number of the current device is meaningless anyway. Signed-off-by: NDmitry Potapov <dpotapov@gmail.com> Acked-by: NJohannes Sixt <johannes.sixt@telecom.at> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Alex Riesen 提交于
Besides, it fixes a memleak (builtin-rm.c) and accidental change of the input const argument (builtin-merge-recursive.c). Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Alex Riesen 提交于
The function has two potential users which both managed to get wrong their implementations (the one in builtin-rm.c one has a memleak, and builtin-merge-recursive.c scribles over its const argument). Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Ping Yin 提交于
Since commit 55218("checkout: do not lose staged removal"), in cmd_add/cmd_update, "git checkout <commit>" following "git clone -n" may fail if <commit> is different from HEAD. So Use "git checkout -f <commit>" to fix this. Signed-off-by: NPing Yin <pkufranky@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Johannes Sixt 提交于
Our poll() emulation did not support the timeout argument. With this patch we support it for the simple case where poll() does not need to wait on file descriptors as well because this case amounts to a mere Sleep(). This is needed if the user sets help.autocorrect is set to a positive value. Signed-off-by: NJohannes Sixt <johannes.sixt@telecom.at> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Stephen Haberman 提交于
Signed-off-by: NStephen Haberman <stephen@exigencecorp.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Nanako Shiraishi 提交于
This removes three functions that are not used anywhere. Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Acked-by: NLars Hjemli <hjemli@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 26 9月, 2008 8 次提交
-
-
由 Shawn O. Pearce 提交于
* maint: Remove empty directories in recursive merge Documentation: clarify the details of overriding LESS via core.pager Conflicts: builtin-merge-recursive.c
-
由 Alex Riesen 提交于
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Alex Riesen 提交于
The code was actually supposed to do that, but was accidentally broken. Noticed by Anders Melchiorsen. Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Chris Frey 提交于
The process of overriding the default LESS options using only git-specific methods is rather obscure. Show the end user how to do it in a step-by-step manner. Signed-off-by: NChris Frey <cdfrey@foursquare.net> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
由 Shawn O. Pearce 提交于
* mv/merge-recursive: builtin-merge: release the lockfile in try_merge_strategy() merge-recursive: get rid of virtual_id merge-recursive: move current_{file,directory}_set to struct merge_options merge-recursive: move the global obuf to struct merge_options merge-recursive: get rid of the index_only global variable merge-recursive: move call_depth to struct merge_options cherry-pick/revert: make direct internal call to merge_tree() builtin-merge: avoid run_command_v_opt() for recursive and subtree merge-recursive: introduce merge_options merge-recursive.c: Add more generic merge_recursive_generic() Split out merge_recursive() to merge-recursive.c
-
由 Shawn O. Pearce 提交于
* jc/alternate-push: push: receiver end advertises refs from alternate repositories push: prepare sender to receive extended ref information from the receiver receive-pack: make it a builtin is_directory(): a generic helper function
-
由 Shawn O. Pearce 提交于
* am/status: wt-status: Teach how to discard changes in the working directory wt-status: Split header generation into three functions
-
由 Shawn O. Pearce 提交于
* pb/autocorrect-wrapper: git wrapper: also use aliases to correct mistyped commands
-