- 23 5月, 2008 3 次提交
-
-
由 Chris Parsons 提交于
This provides additional warning to users when attempting to commit to a detached HEAD. It is configurable in color.status.nobranch. Signed-off-by: NChris Parsons <chris@edendevelopment.co.uk> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Johannes Schindelin 提交于
When rebasing fails during "pull --rebase", you cannot just clean up the working directory and call "pull --rebase" again, since the remote branch was already fetched. Therefore, die early when the working directory is dirty. Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Anders Waldenborg 提交于
Fix chop_str not to cut in middle of utf8 multibyte chars. Without this fix at least author name in short log may cut in middle of a multibyte char. When the result comes to esc_html to_utf8 is called again, which doesn't find valid utf8 and decodes using $fallback_encoding making it even worse. This also have the nice side effect that it actually tries to show the first 10 _characters_, not the number of characters that happened to fit into 10 bytes. Signed-off-by: NAnders Waldenborg <anders@0x63.nu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 22 5月, 2008 17 次提交
-
-
由 Junio C Hamano 提交于
* maint: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/
-
由 Junio C Hamano 提交于
* maint-1.5.4: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/
-
由 Junio C Hamano 提交于
* ar/add-unreadable: Add a config option to ignore errors for git-add Add a test for git-add --ignore-errors Add --ignore-errors to git-add to allow it to skip files with read errors Extend interface of add_files_to_cache to allow ignore indexing errors Make the exit code of add_file_to_index actually useful
-
由 Junio C Hamano 提交于
* ds/branch-auto-rebase: Allow tracking branches to set up rebase by default.
-
由 Junio C Hamano 提交于
* sv/first-parent: revision.c: really honor --first-parent Simplify and fix --first-parent implementation
-
由 Junio C Hamano 提交于
* np/pack: pack-objects: fix early eviction for max depth delta objects pack-objects: allow for early delta deflating pack-objects: move compression code in a separate function pack-objects: clean up write_object() a bit pack-objects: simplify the condition associated with --all-progress pack-objects: remove some double negative logic pack-objects: small cleanup
-
由 Junio C Hamano 提交于
* as/graph: graph API: eliminate unnecessary indentation log and rev-list: add --graph option Add history graph API revision API: split parent rewriting and parent printing options
-
由 Junio C Hamano 提交于
* jk/maint-send-email-compose: send-email: rfc2047-quote subject lines with non-ascii characters send-email: specify content-type of --compose body Conflicts: t/t9001-send-email.sh Due to 065096c2 (git-send-email.perl: Handle shell metacharacters in $EDITOR properly, 2008-05-04) which is a backward incompatible change (but it makes handling of EDITOR consistent with other parts of the system), the test script t9001 had to be adjusted. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* hb/maint-send-email-quote-recipients: Fix recipient santitization
-
由 Trent Piepho 提交于
For a given project the directory used with the -w option is almost always the same each time. Let it be specified with 'cvsexportcommit.cvsdir' so it's not necessary to manually add it with -w each time. Signed-off-by: NTrent Piepho <tpiepho@freescale.com> Acked-by: NRobin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Horst H. von Brand 提交于
Need to quote all special characters, not just the first one Signed-off-by: NHorst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
We always use 'utf-8' as the encoding, since we currently have no way of getting the information from the user. This also refactors the quoting of recipient names, since both processes can share the rfc2047 quoting code. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
If the compose message contains non-ascii characters, then we assume it is in utf-8 and include the appropriate MIME headers. If the user has already included a MIME-Version header, then we assume they know what they are doing and don't add any headers. Signed-off-by: NJeff King <peff@peff.net> 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>
-
由 Miklos Vajna 提交于
gitcli(5) already documents them, and there are no options named --no-no-stat, --no-no-summary and --no-no-log. Signed-off-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Alex Riesen 提交于
[jc: squashed in suggestions from Jeff King] Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Marcel Koeppen 提交于
The patterns to the case statement could never be matched, so the hook was a noop. This patch also replaces the non-portable use of in-place sed. Signed-off-by: NMarcel Koeppen <git-dev@marzelpan.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 5月, 2008 3 次提交
-
-
由 Jeff King 提交于
Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
The git-daemon upload-archive feature has always used the config directive 'daemon.uploadarch'; the documentation which came later seems to have just mistakenly used the wrong name. Noticed by lionel@over-blog.com. Signed-off-by: NJeff King <peff@peff.net> 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>
-
- 19 5月, 2008 2 次提交
-
-
由 Brandon Casey 提交于
Signed-off-by: NBrandon Casey <drafnel@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Alex Riesen 提交于
Exit with error if cd into the "trash directory" failed (error already reported, so just exit). Signed-off-by: NAlex Riesen <raa.lkml@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 17 5月, 2008 8 次提交
-
-
由 Mike Ralphson 提交于
NO_MKDTEMP is required to build, FREAD_READS_DIRECTORIES and the definition of _LARGE_FILES fix test suite failures and INTERNAL_QSORT is required for adequate performance. Tested on AIX v5.3 Maintenance Level 06 Signed-off-by: NMike Ralphson <mike@abacus.co.uk> Tested-by: NJohannes Sixt <johannes.sixt@telecom.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: git-filter-branch: Clarify file removal example.
-
由 Marcel Koeppen 提交于
The in-place mode of sed used in t7502-commit is a non-POSIX extension. That call of sed is replaced by a more portable version using a temporary file. Signed-off-by: NMarcel Koeppen <git-dev@marzelpan.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jon Loeliger 提交于
Signed-off-by: NJon Loeliger <jdl@jdl.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Johannes Schindelin 提交于
When a submodule is not initialized and you do not want to change the defaults from .gitmodules anyway, you can now say $ git submodule update --init <name> When "update" is called without --init on an uninitialized submodule, a hint to use --init is printed. Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Miklos Vajna 提交于
There is a cmd_merge() function in fast-import that will conflict with builtin-merge's cmd_merge() function. To keep it consistent, rename all cmd_*() function to parse_*() Signed-off-by: NMiklos Vajna <vmiklos@frugalware.org> Acked-by: NShawn O. Pearce <spearce@spearce.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Teemu Likonen 提交于
Change "brower.konqueror.path" to "browser.konqueror.path" in documentation. Signed-off-by: NTeemu Likonen <tlikonen@iki.fi> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Imran M Yousuf 提交于
'git config' has a '-f' option that takes the file to parse. Using it rather than the environment variable seems more logical and simplified. Signed-off-by: NImran M Yousuf <imyousuf@smartitengineering.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 15 5月, 2008 7 次提交
-
-
git://repo.or.cz/git-gui由 Junio C Hamano 提交于
* git://repo.or.cz/git-gui: git-gui: Delete branches with 'git branch -D' to clear config git-gui: Setup branch.remote,merge for shorthand git-pull git-gui: Update German translation git-gui: Don't use '$$cr master' with aspell earlier than 0.60 git-gui: Report less precise object estimates for database compression
-
由 Chris Frey 提交于
Clarifies the git-prune man page, documenting that it only prunes unpacked objects. Signed-off-by: NChris Frey <cdfrey@foursquare.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
git://git.kernel.org/pub/scm/gitk/gitk由 Junio C Hamano 提交于
* git://git.kernel.org/pub/scm/gitk/gitk: (44 commits) gitk: Add a progress bar for checking out a head gitk: Show current row number and total number of rows gitk: Allow users to view diffs in external diff viewer gitk: Synchronize highlighting in file view for 'f' and 'b' commands gitk: Make updates go faster gitk: Disable "Reset %s branch to here" when on a detached head gitk: German translation again updated gitk: Update German translation gitk: Makefile/install: force permissions when installing files and dirs gitk: Initial Swedish translation. gitk: Spanish translation of gitk gitk: Fix handling of tree file list with special chars in names gitk: Reorganize processing of arguments for git log gitk: Fix problem with target row not being in scroll region gitk: Avoid a crash in selectline if commitinfo($id) isn't set gitk: Fix some corner cases in computing vrowmod and displayorder gitk: Correct a few strings and comments to say "git log" gitk: Don't filter view arguments through git rev-parse gitk: Fix problems with target row stuff gitk: Handle updating with path limiting better ...
-
由 Junio C Hamano 提交于
* maint: Documentation/git-describe.txt: make description more readable
-
由 Junio C Hamano 提交于
* maint-1.5.4: Documentation/git-describe.txt: make description more readable
-
由 Junio C Hamano 提交于
* sb/committer: commit: Show committer if automatic commit: Show author if different from committer Preparation to call determine_author_info from prepare_to_commit
-
由 Junio C Hamano 提交于
* bd/tests: Rename the test trash directory to contain spaces. Fix tests breaking when checkout path contains shell metacharacters Don't use the 'export NAME=value' in the test scripts. lib-git-svn.sh: Fix quoting issues with paths containing shell metacharacters test-lib.sh: Fix some missing path quoting Use test_set_editor in t9001-send-email.sh test-lib.sh: Add a test_set_editor function to safely set $VISUAL git-send-email.perl: Handle shell metacharacters in $EDITOR properly config.c: Escape backslashes in section names properly git-rebase.sh: Fix --merge --abort failures when path contains whitespace Conflicts: t/t9115-git-svn-dcommit-funky-renames.sh
-