- 16 9月, 2008 2 次提交
-
-
由 Thomas Rast 提交于
This points readers at the "Recovering from upstream rebase" warning in git-rebase(1) when we talk about rewriting published history in the 'reset', 'commit --amend', and 'filter-branch' documentation. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Thomas Rast 提交于
Document how to recover if the upstream that you pull from has rebased the branches you depend your work on. Hopefully this can also serve as a warning to potential rebasers. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 13 9月, 2008 4 次提交
-
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* ho/maint-dashless: Start conforming code to "git subcmd" style part 2
-
由 Ralf Wildenhues 提交于
Signed-off-by: NRalf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 12 9月, 2008 1 次提交
-
-
由 Jeff King 提交于
Commit 3632cfc2 makes the same change for Darwin; however, the problem also exists on FreeBSD. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 11 9月, 2008 11 次提交
-
-
由 Johannes Sixt 提交于
This augments 3632cfc2 (Use compatibility regex library on Darwin, 2008-09-07), which already carries a "Tested-by" statement for AIX, but that test was actually done with this patch included. Signed-off-by: NJohannes Sixt <johannes.sixt@telecom.at> Tested-by: NMike Ralphson <mike@abacus.co.uk> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nanako Shiraishi 提交于
It is one of the server side programs and needs to be found on usual $PATH. Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael J Gruber 提交于
This introduces new build targets "man" and "html" which allow building the documentation in the respective formats separately. This helps people with a partial documentation build chain: html pages can be built without xmlto. This is documented in INSTALL now, together with corrections: Before, instructions in INSTALL would build man+html but install man only. Now the instructions build and install both, and new and pre-existing targets are explained. Note that build targets "doc" and "man" correspond to install targets "install-doc install-html" and "install-doc" respectively. This inconsistency is not changed, in order to keep everyone's build scripts from breaking. Signed-off-by: NMichael J Gruber <michaeljgruber+gmane@fastmail.fm> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael J Gruber 提交于
This patch introduces a make target "quick-install-html" which installs the html documentation from the branch origin/html, without the need for asciidoc/xmlto. This is analogous to the existing "quick-install-doc" target for the man pages. We advertise these targets in the INSTALL file now. Signed-off-by: NMichael J Gruber <michaeljgruber+gmane@fastmail.fm> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
140b378d (Teach git diff-tree --stdin to diff trees, 2008-08-10) broke the more important case of reading series of commits to filter ones that touch given pathspecs. Noticed by Mark Levedahl, running "gitk ec3a4ba5" and trying to focus on commits that touch "t/" directory. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Update draft release notes for 1.6.0.2 Use compatibility regex library for OSX/Darwin git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl Git.pm: Use File::Temp->tempfile instead of ->new t7501: always use test_cmp instead of diff Conflicts: Makefile
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Arjen Laarhoven 提交于
The standard libc regex library on OSX does not support alternation in POSIX Basic Regular Expression mode. This breaks the diff.funcname functionality on OSX. To fix this, we use the GNU regex library which is already present in the compat/ diretory for the MinGW port. However, simply adding compat/ to the COMPAT_CFLAGS variable causes a conflict between the system fnmatch.h and the one present in compat/. To remedy this, move the regex and fnmatch functionality to their own subdirectories in compat/ so they can be included seperately. Signed-off-by: NArjen Laarhoven <arjen@yaph.org> Tested-by: Mike Ralphson <mike@abacus.co.uk> (AIX) Tested-by: Johannes Sixt <johannes.sixt@telecom.at> (MinGW) Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Marcus Griep 提交于
Signed-off-by: NMarcus Griep <marcus@griep.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Marcus Griep 提交于
Perl 5.8.0 ships with File::Temp 0.13, which does not have the new() interface introduced in 0.14, as pointed out by Tom G. Christensen. This modifies Git.pm to use the more established tempfile() interface and updates 'git svn' to match. Signed-off-by: NMarcus Griep <marcus@griep.us> Acked-by: NEric Wong <normalperson@yhbt.net> Tested-by: NTom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Miklos Vajna 提交于
This should make the output more readable (by default using diff -u) when some tests fail. Also changed the diff order from "current expected" to "expected current". Signed-off-by: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 10 9月, 2008 11 次提交
-
-
由 Junio C Hamano 提交于
* jc/maint-log-grep: log --author/--committer: really match only with name part
-
由 Junio C Hamano 提交于
* jc/maint-hide-cr-in-diff-from-less: diff: Help "less" hide ^M from the output
-
由 Junio C Hamano 提交于
* jc/maint-checkout-fix: checkout: do not check out unmerged higher stages randomly
-
由 Junio C Hamano 提交于
* np/maint-safer-pack: fixup_pack_header_footer(): use nicely aligned buffer sizes index-pack: use fixup_pack_header_footer()'s validation mode pack-objects: use fixup_pack_header_footer()'s validation mode improve reliability of fixup_pack_header_footer() pack-objects: improve returned information from write_one()
-
由 Nanako Shiraishi 提交于
Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nanako Shiraishi 提交于
This changes "git-foo" to "git foo" when message strings in tests name git subcommands. Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nanako Shiraishi 提交于
Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nanako Shiraishi 提交于
Also use "git hash-object" and "git rev-parse" without dash. Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nanako Shiraishi 提交于
Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* ho/dashless: Start conforming code to "git subcmd" style part 2
-
由 Dotan Barak 提交于
Some places use the standard malloc/strdup without checking if the allocation was successful; they should use xmalloc/xstrdup that check the memory allocation result. Signed-off-by: NDotan Barak <dotanba@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 09 9月, 2008 8 次提交
-
-
由 Heikki Orsila 提交于
User notifications are presented as 'git cmd', and code comments are presented as '"cmd"' or 'git's cmd', rather than 'git-cmd'. Signed-off-by: NHeikki Orsila <heikki.orsila@iki.fi> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Christian Couder 提交于
The existing in-code comment was misleading. An access that is not "reading" may often be "writing", but it does not have to be. Signed-off-by: NChristian Couder <chriscool@tuxfamily.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Arjen Laarhoven 提交于
OS X sed doesn't understand '\n' on the right side of a substitution. Use a valid substitution character instead and use 'tr' to convert those to a newline. Signed-off-by: NArjen Laarhoven <arjen@yaph.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Mikael Magnusson 提交于
The non-verbose output was not changed in fdb2a2a6 (compat: introduce on_disk_bytes(), 2008-08-18) which caused git-count-objects to claim 512 times too much space used for loose objects. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Johannes Sixt 提交于
The reason that git-shell was excluded from the Windows build was that our compatibility layer needed stuff that was removed when we tried to link less of the git library into git-shell. Since 4cfc24af (shell: do not play duplicated definition games to shrink the executable, 2008-08-19) the complete library is linked again, so we can build git-shell on Windows as well. (This fixes 'make install', which depends on that git-shell is always built.) Signed-off-by: NJohannes Sixt <johannes.sixt@telecom.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nanako Shiraishi 提交于
This replaces 'git-svn' with 'git svn' in the tests. Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nanako Shiraishi 提交于
Subversion tests use too many "git-foo" form, so I am converting them in two steps. This first step replaces literal strings "remotes/git-svn" and "git-svn-id" by introducing $remotes_git_svn and $git_svn_id constants defined as shell variables. This will reduce the number of false hits from "git grep". Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com> 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: fix handling of even funkier branch names
-
- 08 9月, 2008 3 次提交
-
-
由 Junio C Hamano 提交于
* ar/autospell: Add help.autocorrect to enable/disable autocorrecting git wrapper: DWIM mistyped commands
-
由 Junio C Hamano 提交于
* jc/cc-ld-dynpath: configure: auto detect dynamic library path switches Makefile: Allow CC_LD_DYNPATH to be overriden Conflicts: Makefile config.mak.in
-
由 Junio C Hamano 提交于
* jc/hide-cr-in-diff-from-less: diff: Help "less" hide ^M from the output
-