summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-10-19Documentation: add manpage about workflowsLibravatar Thomas Rast2-1/+365
This attempts to make a manpage about workflows that is both handy to point people at it and as a beginner's introduction. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-15Documentation: Refer to git-rebase(1) to warn against rewritingLibravatar Thomas Rast3-2/+10
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: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-15Documentation: new upstream rebase recovery section in git-rebaseLibravatar Thomas Rast1-5/+125
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: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-12Sync with 1.6.0.2Libravatar Junio C Hamano6-6/+11
2008-09-12GIT 1.6.0.2Libravatar Junio C Hamano2-2/+4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-12Merge branch 'ho/maint-dashless' into maintLibravatar Junio C Hamano5-14/+14
* ho/maint-dashless: Start conforming code to "git subcmd" style part 2
2008-09-12Fix some manual typos.Libravatar Ralf Wildenhues3-3/+3
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-11Use compatibility regex library also on FreeBSDLibravatar Jeff King1-0/+2
Commit 3632cfc24 makes the same change for Darwin; however, the problem also exists on FreeBSD. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-11Use compatibility regex library also on AIXLibravatar Johannes Sixt1-0/+2
This augments 3632cfc24 (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: Johannes Sixt <johannes.sixt@telecom.at> Tested-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-10Install git-cvsserver in $(bindir)Libravatar Nanako Shiraishi1-1/+1
It is one of the server side programs and needs to be found on usual $PATH. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-10separate build targets for man and html documentationLibravatar Michael J Gruber2-3/+18
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: Michael J Gruber <michaeljgruber+gmane@fastmail.fm> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-10allow installation of man and html doc from the man and html branchesLibravatar Michael J Gruber3-0/+13
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: Michael J Gruber <michaeljgruber+gmane@fastmail.fm> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-10Fix git-diff-tree --stdinLibravatar Junio C Hamano2-3/+15
140b378 (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 ec3a4ba" and trying to focus on commits that touch "t/" directory. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-10Merge branch 'maint'Libravatar Junio C Hamano10-25/+71
* 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
2008-09-10Update draft release notes for 1.6.0.2Libravatar Junio C Hamano1-2/+22
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-10Use compatibility regex library for OSX/DarwinLibravatar Arjen Laarhoven6-2/+10
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: Arjen 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: Junio C Hamano <gitster@pobox.com>
2008-09-10git-svn: Fixes my() parameter list syntax error in pre-5.8 PerlLibravatar Marcus Griep1-1/+1
Signed-off-by: Marcus Griep <marcus@griep.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-10Git.pm: Use File::Temp->tempfile instead of ->newLibravatar Marcus Griep2-14/+32
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: Marcus Griep <marcus@griep.us> Acked-by: Eric Wong <normalperson@yhbt.net> Tested-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-10t7501: always use test_cmp instead of diffLibravatar Miklos Vajna1-6/+6
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: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-10Merge branch 'jc/maint-log-grep' into maintLibravatar Junio C Hamano4-17/+114
* jc/maint-log-grep: log --author/--committer: really match only with name part
2008-09-10Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maintLibravatar Junio C Hamano3-3/+34
* jc/maint-hide-cr-in-diff-from-less: diff: Help "less" hide ^M from the output
2008-09-10Merge branch 'jc/maint-checkout-fix' into maintLibravatar Junio C Hamano2-1/+50
* jc/maint-checkout-fix: checkout: do not check out unmerged higher stages randomly
2008-09-10Merge branch 'np/maint-safer-pack' into maintLibravatar Junio C Hamano6-55/+112
* 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()
2008-09-09t9101: use "git hash-object" without dashLibravatar Nanako Shiraishi1-14/+14
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-09tests: use "git foo" without dash in stringsLibravatar Nanako Shiraishi9-13/+13
This changes "git-foo" to "git foo" when message strings in tests name git subcommands. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-09t9700: use "git config" without dashLibravatar Nanako Shiraishi1-8/+8
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-09t9300, t9301: use "git fast-import/fast-export" without dashLibravatar Nanako Shiraishi2-41/+41
Also use "git hash-object" and "git rev-parse" without dash. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-09t9200: use "git cvsexportcommit" without dashLibravatar Nanako Shiraishi1-7/+7
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-09Merge branch 'ho/dashless'Libravatar Junio C Hamano5-14/+14
* ho/dashless: Start conforming code to "git subcmd" style part 2
2008-09-09Use xmalloc() and friends to catch allocation failuresLibravatar Dotan Barak5-6/+6
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: Dotan Barak <dotanba@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-09Start conforming code to "git subcmd" style part 2Libravatar Heikki Orsila5-14/+14
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: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-09refs: improve comments about "reading" argument of "resolve_ref"Libravatar Christian Couder1-7/+13
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: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-08t6023-merge-file: Work around non-portable sed usageLibravatar Arjen Laarhoven1-2/+2
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: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-08Correct output of git-count-objects.Libravatar Mikael Magnusson1-1/+1
The non-verbose output was not changed in fdb2a2a (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: Junio C Hamano <gitster@pobox.com>
2008-09-08Windows: git-shell can be compiled againLibravatar Johannes Sixt1-1/+1
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 4cfc24a (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: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-08t/t91XX git-svn tests: run "git svn" not "git-svn"Libravatar Nanako Shiraishi27-174/+174
This replaces 'git-svn' with 'git svn' in the tests. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-08t/t91XX-svn: start removing use of "git-" from these testsLibravatar Nanako Shiraishi10-55/+58
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: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-08Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano2-0/+17
* git://git.bogomips.org/git-svn: git-svn: fix handling of even funkier branch names
2008-09-07Merge branch 'ar/autospell'Libravatar Junio C Hamano8-4/+159
* ar/autospell: Add help.autocorrect to enable/disable autocorrecting git wrapper: DWIM mistyped commands
2008-09-07Merge branch 'jc/cc-ld-dynpath'Libravatar Junio C Hamano3-8/+42
* jc/cc-ld-dynpath: configure: auto detect dynamic library path switches Makefile: Allow CC_LD_DYNPATH to be overriden Conflicts: Makefile config.mak.in
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Libravatar Junio C Hamano3-3/+34
* jc/hide-cr-in-diff-from-less: diff: Help "less" hide ^M from the output
2008-09-07Merge branch 'jc/maint-checkout-fix'Libravatar Junio C Hamano2-1/+50
* jc/maint-checkout-fix: checkout: do not check out unmerged higher stages randomly Conflicts: t/t7201-co.sh
2008-09-07Teach "git diff -p" to locate PHP class methodsLibravatar Andreas Ericsson2-2/+5
Otherwise it will always print the class-name rather than the name of the function inside that class. While we're at it, reorder the gitattributes manpage to list the built-in funcname pattern names in alphabetical order. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-06git-svn: fix handling of even funkier branch namesLibravatar Eric Wong2-0/+17
Apparently do_switch() tolerates the lack of escaping in less funky branch names. For the really strange and scary ones, we need to escape them properly. It strangely maintains compatible with the existing handling of branch names with spaces and exclamation marks. Reported-by: m.skoric@web.de ($gmane/94677) Signed-off-by: Eric Wong <normalperson@yhbt.net>
2008-09-06Update draft release notes for 1.6.1Libravatar Junio C Hamano1-2/+7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-06Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano3-119/+164
* git://git.bogomips.org/git-svn: git-svn: set auto_props when renaming files t9124: clean up chdir usage git-svn: fix 'info' tests for unknown items git-svn: match SVN 1.5 behaviour of info' on unknown item git svn info: always quote URLs in 'info' output git svn info: make info relative to the current directory git svn info: tests: fix ptouch argument order in setup git svn info: tests: use test_cmp instead of git-diff git svn info: tests: do not use set -e git svn info: tests: let 'init' test run with SVN 1.5 git svn: catch lack of upstream info for dcommit earlier git-svn: check error code of send_txstream git-svn: Send deltas during commits git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob git-svn: extract base blob in generate_diff
2008-09-06git-svn: set auto_props when renaming filesLibravatar Paul Talacko2-0/+18
Patch-by: Paul Talacko <gnuruandstuff@yahoo.co.uk>: <http://article.gmane.org/gmane.comp.version-control.git/95006> > Hello, > > There's an issue in git-svn as autoprops are not applied to > renamed files, only to added files. > > This patch fixes the bug. [ew: added test case] Signed-off-by: Eric Wong <normalperson@yhbt.net>
2008-09-06t9124: clean up chdir usageLibravatar Eric Wong1-4/+2
Spawn subshells when running things in subdirectories instead of chdir-ing to the path of an undefined variable, which is confusing. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2008-09-06Merge updated git-gui and gitk that call each otherLibravatar Junio C Hamano9-120/+943
Merge git://repo.or.cz/git-gui and git://git.kernel.org/pub/scm/gitk/gitk * git://repo.or.cz/git-gui: git-gui: Show special diffs for complex conflict cases. git-gui: Make F5 reselect a diff, if an untracked file is selected. git-gui: Reimplement and enhance auto-selection of diffs. git-gui: Support conflict states _U & UT. git-gui: Support more merge tools. git-gui: Don't allow staging files with conflicts. git-gui: Support calling merge tools. git-gui: Support resolving conflicts via the diff context menu. git-gui: Mark forgotten strings for translation. git-gui: Allow specifying an initial line for git gui blame. git-gui: Better positioning in Blame Parent Commit git-gui: Support passing blame to a parent commit. git-gui: Support starting gitk from Gui Blame git-gui: Teach git gui about file type changes * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add menu item for calling git gui blame gitk: Add option to specify the default commit on command line
2008-09-06Merge branch 'maint'Libravatar Junio C Hamano10-388/+477
* maint: Update draft release notes for 1.6.0.2 stash: refresh the index before deciding if the work tree is dirty Mention the fact that 'git annotate' is only for backward compatibility. "blame -c" should be compatible with "annotate" git-gui: Fix diff parsing for lines starting with "--" or "++" git-gui: Fix string escaping in po2msg.sh git gui: show diffs with a minimum of 1 context line git-gui: update all remaining translations to French. git-gui: Update french translation
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 07:40:07 +0000