- 03 11月, 2009 2 次提交
-
-
由 Junio C Hamano 提交于
* jn/show-normalized-refs: t1402: Make test executable
-
由 Stephen Boyd 提交于
Signed-off-by: NStephen Boyd <bebarino@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 02 11月, 2009 2 次提交
-
-
由 Junio C Hamano 提交于
* maint: Makefile: add compat/bswap.h to LIB_H
-
由 Dmitry V. Levin 提交于
Starting with commit 51ea5519, git-compat-util.h includes compat/bswap.h Signed-off-by: NDmitry V. Levin <ldv@altlinux.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 01 11月, 2009 1 次提交
-
-
由 Junio C Hamano 提交于
This reverts commit 0cc5691a. 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.
-
- 31 10月, 2009 19 次提交
-
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
* js/diff-verbose-submodule: add tests for git diff --submodule Add the --submodule option to the diff option family
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* jc/maint-1.6.3-graft-trailing-space: info/grafts: allow trailing whitespaces at the end of line
-
由 Junio C Hamano 提交于
* ak/bisect-reset-to-switch: bisect reset: Allow resetting to any commit, not just a branch
-
由 Junio C Hamano 提交于
* tr/maint-roff-quote: Quote ' as \(aq in manpages
-
由 Junio C Hamano 提交于
* 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
-
由 Junio C Hamano 提交于
* cb/doc-fetch-pull-merge: modernize fetch/merge/pull examples
-
由 Junio C Hamano 提交于
* maint: clone: detect extra arguments clone: fix help on options push: fix typo in usage More precise description of 'git describe --abbrev'
-
由 Jonathan Nieder 提交于
If git clone is given more than two non-option arguments, it silently throws away all but the first one. Complain instead. Discovered by comparing the new builtin clone to the old git-clone.sh. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Fix incorrect description of --recursive, and stop listing the historical synonym --naked that is not advertised anywhere. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
Missing ")". Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
Because --root can put our trash directories elsewhere, using ".." may not always work. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael J Gruber 提交于
so that they can be run individually as (cd t && ./t9150-svk-mergetickets.sh) etc. just like all other test scripts. Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Gisle Aas 提交于
Also adds a note about why the output in the examples might give different output today. Signed-off-by: NGisle Aas <gisle@aas.no> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Robin Rosenberg 提交于
Git itself does not even look at this directory. Any tools that actually needs it should create it itself. Signed-off-by: NRobin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Sebastian Schuberth 提交于
Instead of having all PDB files for all projects named "vc90.pdb", name them after the respective project to make the relation more clear (and to avoid name clashes when copying files around). Signed-off-by: NSebastian Schuberth <sschuberth@gmail.com> Acked-by: NMarius Storm-Olsen <mstormo@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Sebastian Schuberth 提交于
When compiling with MSVC on x86-compatible, use an intrinsic for byte swapping. In contrast to the GCC path, we do not prefer inline assembly here as it is not supported for the x64 platform. Signed-off-by: NSebastian Schuberth <sschuberth@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 29 10月, 2009 4 次提交
-
-
由 Junio C Hamano 提交于
* maint: help -a: do not unnecessarily look for a repository Do not try to remove directories when removing old links rebase -i: more graceful handling of invalid commands help -i: properly error out if no info viewer can be found
-
由 David Brown 提交于
'git commit -s' will insert a blank line before the Signed-off-by line at the end of the message, unless this last line is a Signed-off-by line itself. Common use has other trailing lines at the ends of commit text, in the style of RFC2822 headers. Be more generous in considering lines to be part of this footer. If the last paragraph of the commit message reasonably resembles RFC-2822 formatted lines, don't insert that blank line. The new Signed-off-by line is still only suppressed when the author's existing Signed-off-by is the last line of the message. Signed-off-by: NDavid Brown <davidb@quicinc.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Markus Heidelberg 提交于
So complete refs, files after the double-dash and some diff options that make sense for difftool. Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de> Acked-by: NShawn O. Pearce <spearce@spearce.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Johannes Schindelin 提交于
Although 'git help -a' actually doesn't need to be run inside a git repository and uses no repository-specific information, it looks for a git directory. On 'git <TAB><TAB>' the bash completion runs 'git help -a' and unnecessary searching for a git directory can be annoying in auto-mount environments. With this commit, 'git help' no longer searches for a repository when run with the -a option. Reported by Vincent Danjean through http://bugs.debian.org/539273Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NGerrit Pape <pape@smarden.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 28 10月, 2009 8 次提交
-
-
由 Björn Gustavsson 提交于
Complete all long options for 'git rebase' except --no-verify (probably used very seldom) and the long options corresponding to -v, -q, and -f. Signed-off-by: NBjörn Gustavsson <bgustavsson@gmail.com> Acked-by: NShawn O. Pearce <spearce@spearce.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint-1.6.4: rebase -i: more graceful handling of invalid commands help -i: properly error out if no info viewer can be found
-
由 Sebastian Schuberth 提交于
When building Git with MSVC on Windows, directories named after the Git alias are created for the output files, e.g. there is a "git-merge-index" directory next to the "git-merge-index.exe" executable in the build root. Previously, "make all" just checked if "git-merge-index" and "git-merge-index.exe" are the same file, and if not, tried to remove "git-merge-index". This fails in the case of "git-merge-index" being a directory, which is why this is checked now. Signed-off-by: NSebastian Schuberth <sschuberth@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jan Krüger 提交于
Currently, when there is an invalid command, the rest of the line is still treated as if the command had been valid, i.e. rebase -i attempts to produce a patch, using the next argument as a SHA1 name. If there is no next argument or an invalid one, very confusing error messages appear (the line was '.'; path to git-rebase-todo substituted): Unknown command: . fatal: ambiguous argument 'Please fix this in the file $somefile.': unknown revision or path not in the working tree. Use '--' to separate paths from revisions fatal: Not a valid object name Please fix this in the file $somefile. fatal: bad revision 'Please fix this in the file $somefile.' Instead, verify the validity of the remaining line and error out earlier if necessary. Signed-off-by: NJan Krüger <jk@jk.gs> Acked-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Gerrit Pape 提交于
With this commit, git help -i <cmd> prints an error message and exits non-zero instead of being silent and exit code 0. Reported by Trent W. Buck through http://bugs.debian.org/537664Signed-off-by: NGerrit Pape <pape@smarden.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
git://git.bogomips.org/git-svn由 Junio C Hamano 提交于
* git://git.bogomips.org/git-svn: git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents git-svn: add test data for SVN 1.5+ merge, with script. git-svn: convert SVK merge tickets to extra parents git-svn: allow test setup script to support PERL env. var git-svn: add test data for SVK merge, with script. git svn: fix fetch where glob is on the top-level URL
-
git://repo.or.cz/git-gui由 Junio C Hamano 提交于
* git://repo.or.cz/git-gui: git-gui: adjust the minimum height of diff pane for shorter screen height git-gui: fix use of uninitialized variable git-gui: store wm state and fix wm geometry git-gui: Ensure submodule path is quoted properly git-gui: fix diff for partially staged submodule changes git-gui: Update russian translation git-gui: Limit display to a maximum number of files git-gui: remove warning when deleting correctly merged remote branch git-gui: Added Greek translation & glossary git-gui: display summary when showing diff of a submodule
-
由 Vietor Liu 提交于
When the main window is maximized, if the screen height is shorter (e.g. Netbook screen 1024x600), both the partial commit pane and the status bar are hidden. The diff pane is resizable, so that it can use less vertical height, allowing the overall window to be shorter and still display both the entire commit pane and status bar. Signed-off-by: NVietor Liu <vietor@vxwo.org> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
-
- 27 10月, 2009 4 次提交
-
-
由 Sam Vilain 提交于
This feature is long overdue; convert SVN's merge representation to git's as revisions are imported. This works by converting the list of revisions in each line of the svn:mergeinfo into git revision ranges, and then checking the latest of each of these revision ranges for A) being new and B) now being completely merged. Signed-off-by: NSam Vilain <sam.vilain@catalyst.net.nz> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Sam Vilain 提交于
Dump generated with SVN 1.5.1 (on lenny amd64). This test should hopefully cover all but a few intermediate versions of the svnmerge.py script. Signed-off-by: NSam Vilain <sam.vilain@catalyst.net.nz> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Sam Vilain 提交于
SVK is a simple case to start with, as its idea of merge parents matches git's one. When a svk:merge ticket is encountered, check each of the listed merged revisions to see if they are in the history of this commit; if not, then we have encountered a merge - record it. [ew: minor formatting cleanups] Signed-off-by: NSam Vilain <sam.vilain@catalyst.net.nz> Acked-by: NEric Wong <normalperson@yhbt.net>
-
由 Sam Vilain 提交于
Possibly the 'perl' in the PATH is not the one to be used for the tests; let PERL set in the environment select it. Signed-off-by: NSam Vilain <sam.vilain@catalyst.net.nz> Acked-by: NEric Wong <normalperson@yhbt.net>
-