aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add --pretty=fullerJunio C Hamano2005-11-11
| | | | | | | | | git log without --pretty showed author and author-date, while with --pretty=full showed author and committer but no dates. The new formatting option, --pretty=fuller, shows both name and timestamp for author and committer. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not lose author name information to locale gotchas.Junio C Hamano2005-11-11
| | | | | | | | | | | | I noticed format-patch loses authorship information of Lukas' patch when I run git tools with LC_LANG set to ja_JP. It turns out that the sed script to set environment variables were not working on his name (encoded in UTF-8), which is unfortunate but technically correct. Force sed invocation under C locale because we always want literal byte semantics. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: "host:path/to/repo" is git native over ssh.Junio C Hamano2005-11-11
| | | | | | | | | | You could also spell it ssh://host:/path/to/repo (or git+ssh, ssh+git), but without method:// is shorter to type, so mention only that one in the short and sweet list. Noticed by Pasky. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Let git-clone/git-fetch follow HTTP redirectionsJosef Weidendorfer2005-11-10
| | | | | | | | | | | Otherwise, git-clone silently failed to clone a remote repository where redirections (ie. a response with a "Location" header line) are used. This includes the fixes from Nick Hengeveld. Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix confusing git-update-ref error messagePetr Baudis2005-11-10
| | | | | | | | | When git-update-ref has hit the "Ref %s changed to %s" error, I just stare at it, left puzzled. This patch attempts to reword that to a more useful and less confusing error message. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add missing git-core and cvsps RPM dependencies.Jim Radford2005-11-10
| | | | | Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make git-recursive the default strategy for git-pull.Junio C Hamano2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does two things: - It changes the hardcoded default merge strategy for two-head git-pull from resolve to recursive. - .git/config file acquires two configuration items. pull.twohead names the strategy for two-head case, and pull.octopus names the strategy for octopus merge. IOW you are paranoid, you can have the following lines in your .git/config file and keep using git-merge-resolve when pulling one remote: [pull] twohead = resolve OTOH, you can say this: [pull] twohead = resolve twohead = recursive to try quicker resolve first, and when it fails, fall back to recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use 'merge-base --all' where applicable.Junio C Hamano2005-11-09
| | | | | | | It may get extra merge base on truly pathological commit histories, but is a lot easier to understand, explain, and prove correctness. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'hold/svn'Junio C Hamano2005-11-09
|\
| * Fix a couple of obvious and insignificant typo.Junio C Hamano2005-11-08
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Lift the default limit of number of revs.Yaacov Akiba Slama2005-11-08
| | | | | | | | | | | | | | | | | | Now that the leak is gone, there is by default no limit of revisions to import. No more message about leak when the limit (given by the -l parameter) is reached. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Handle a revision that only creates a new tag correctly.Yaacov Akiba Slama2005-11-08
| | | | | | | | | | | | | | | | Fix an error when a svn revision consists only of the creation of a new tag directory (/tags/this_is_a_tag). Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Bundle file copies from multiple branches into a merge.Yaacov Akiba Slama2005-11-08
| | | | | | | | | | | | | | | | When copying files and/or directories from several branches in one single revision, all these branches are used as parents of the commit. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * copy_dir becomes copy_path and handles both files and directoriesYaacov Akiba Slama2005-11-08
| | | | | | | | | | | | | | The A (Add) and R (Replace) actions handling are unified. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Don't output error on changes in the nodes /, /tags or /branchesYaacov Akiba Slama2005-11-08
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add node_kind function to differentiate between file and directoryYaacov Akiba Slama2005-11-08
| | | | | | | | | | Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Use svn pools to solve the memory leak problem.Yaacov Akiba Slama2005-11-08
| | | | | | | | | | Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'hold/rpm'Junio C Hamano2005-11-09
|\ \
| * | Separate RPMS for programs with non-standard dependencies.Jim Radford2005-11-08
| |/ | | | | | | | | Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-apply: do not fail on binary diff when not applying nor checking.Junio C Hamano2005-11-09
| | | | | | | | | | | | | | | | | | | | | | We run git-apply with --stat and --summary at the end of the pull by default, which causes it to barf when the pull brought in changes to binary files. Just mark them as binary patch and proceed when not applying nor checking. [jc: I almost missed --check until I saw Linus did something similar.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update INSTALLJunio C Hamano2005-11-09
| | | | | | | | | | | | | | Explicitly mention how to install by hand in build-as-user and install-as-root steps. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | merge-recursive: Fix support for branch names containing slashesFredrik Kuivinen2005-11-09
| | | | | | | | | | | | | | A branch name could have a slash in it. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | merge-recursive: Fix limited output of rename messagesFredrik Kuivinen2005-11-09
| | | | | | | | | | | | | | The previous code did the right thing, but it did it by accident. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix cvsexportcommit syntax errorAlexander Litvinov2005-11-08
| | | | | | | | | | | | There is a syntax error in cvsexport script: Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update howto using-topic-branchesLuck, Tony2005-11-08
| | | | | | | | | | | | | | | | "git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | sparse fixes for http-{fetch,push}.cPeter Hagervall2005-11-08
| | | | | | | | | | | | | | | | Make a bunch of needlessly global functions static, and replace two K&R-style declarations. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-tag -d <tag>: delete tag <tag>Kai Ruemmler2005-11-08
| | | | | | | | | | | | | | This adds option '-d' to git-tag.sh and documents it. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | make tests ignorable with "make -i"Alex Riesen2005-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | Allow failed tests to be ignored using make's "-i". The patch also disables parallel make in t/. This doesn't make the testing any different as before: the tests were run sequentially before. It also allows to run more tests, ignoring the ones usually failing just to figure out if something else broke. (Or to ignore plainly uninteresting situations because of the testing being done on say... cygwin ;) Signed-off-by: Junio C Hamano <junkio@cox.net>
* | fix t5000-tar-tree.sh when $TAR isn't setAlex Riesen2005-11-08
| | | | | | | | | | | | | | $TAR isn't set everywhere. Provide a default (tar) Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Clean build annoyance.Junio C Hamano2005-11-08
|/ | | | | | | | | As Pasky pointed out, building in templates directory showed list of built template files which was unneeded. This commit also fixes another build annoyance I recently left in by accident. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am: do not lose already edited final-commit when resuming.Junio C Hamano2005-11-08
| | | | | | | The last round stopped munging the patch when resuming, but failed to preserve final-commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* ls-files and read-tree need core.filemodeAlex Riesen2005-11-08
| | | | | | | | | ls-files.c and read-tree.c miss the default configuration, in particular the filemode=false part. The recent +x bit flip made me notice that, because git-merge refused to merge anything saying that git-pull.sh is not up to date. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Debian: packaging updates.Junio C Hamano2005-11-08
| | | | | | | | | Do not scatter txt and html documentation into feature subpackages. Do place man pages into them. Capture more cvs stuff into git-cvs package. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use consistent shell prompts and example style.Jon Loeliger2005-11-08
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add --tags documentation, scraped from JC mail.Jon Loeliger2005-11-08
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add support for git-http-push to git-push scriptNick Hengeveld2005-11-08
| | | | | Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Tutorial: do not use 'git resolve'.Junio C Hamano2005-11-08
| | | | | | Use 'git merge' instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: fix dependency generation.Junio C Hamano2005-11-08
| | | | | | | The previous rule misses the case where git.txt or tutorial.txt includes new files. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add bug isolation howto, scraped from Linus.Jon Loeliger2005-11-07
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Ignore more generated files.Junio C Hamano2005-11-07
| | | | | | | List new commands cvsexportcommit and http-push to .gitignore list. Also cover the test programs (test-date and test-delta). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix documentation dependency generation.Junio C Hamano2005-11-07
| | | | | | | | | Documentation/Makefile spent a lot of time to generate include dependencies, which was quite noticeable especially during "make clean". Rewrite it to generate just a single dependency file. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: asciidoc formatting fix for git-cvsexportcommit doc.Junio C Hamano2005-11-07
| | | | | | | Annoyingly enough, asciidoc wants the same number of '=' on the second line as there are characters on the first line. Signed-off-by: Junio C Hamano <junkio@cox.net>
* merge-recursive: Only print relevant rename messagesFredrik Kuivinen2005-11-07
| | | | | | | | | | | | | It isn't really interesting to know about the renames that have already been committed to the branch you are working on. Furthermore, the 'git-apply --stat' at the end of git-(merge|pull) will tell us about any renames in the other branch. With this commit only renames which require a file-level merge will be printed. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not fail on hierarchical tagnames.Junio C Hamano2005-11-07
| | | | | | | | This is a companion patch to 13d1cc3604a1a64cb5a6025bba8af8b74a373963 commit, which made hierarchical branch name possible. "git tag v0.99.9/a" would fail otherwise. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Small bugfixes for http-push.cJohannes Schindelin2005-11-07
| | | | | | | | | | | | This patch fixes three things: - older libexpat does not know about enum XML_Status - as in my patch for http-fetch, do not rely on a curl result in free()d data - calloc the new_lock structure Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make http-push smarter about creating remote dirsNick Hengeveld2005-11-07
| | | | | | | | Remember object directories known to exist in the remote repo and don't bother trying to create them. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Introducing: git-cvsexportcommitMartin Langhoff2005-11-07
| | | | | | | | | | | | | | A script that can replay commits git into a CVS checkout. Tries to ensure the sanity of the operation and supports mainly manual usage. If you are reckless enough, you can ask it to autocommit when everything has applied cleanly. Combined with a couple more scripts could become part of a git2cvs gateway. Should support adds/removes and binary files. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation update: use git branch -d foo where applicableKai Ruemmler2005-11-07
| | | | | | | | This updates documentation to use git branch -d foo in favour of rm .git/refs/heads/foo Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Recover dropped +x bit from git-pull.sh by accident.Junio C Hamano2005-11-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: talk about guts of merge in tutorial.Junio C Hamano2005-11-06
| | | | | | | | | While discussing Jon's ASCII art on merge operations with him, I realized that the tutorial stops talking about the plumbing details halfway. So fill in the gory details, and update the examples to use 'git-merge', not 'git-resolve'. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-25 00:24:33 +0000