Commits

Author Commit Message Labels Comments Date
Pavel Roskin
Add --no-commit-id option for git-diff-tree, use it in gitk This patch introduces -no-commit-id option for git-diff-tree, which suppresses commit ID output. [jc: dropped gitk part for now.] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
octopus: do not do AND'ed merge base. When doing an octopus, we incorrectly used the previous merge base as the reference to compute next merge base. This was unnecessary, because that can never be better than using the original HEAD. And that is far simpler as well ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Add --pretty=fuller 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>
Junio C Hamano
Do not lose author name information to locale gotchas. 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…
Junio C Hamano
Documentation: "host:path/to/repo" is git native over ssh. 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>
Josef Weidendorfer
Let git-clone/git-fetch follow HTTP redirections 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>
Petr Baudis
Fix confusing git-update-ref error message 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>
Jim Radford
Add missing git-core and cvsps RPM dependencies. Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
GIT 0.99.9g Another snapshot, as slow and steady marth towards 1.0 continues. Major changes include: - Jim Radford's RPM split. - Fredrik's recursive merge strategy is now default for two heads merge. - Yaacov's SVN importer updates. Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v0.99.9g
Junio C Hamano
Make git-recursive the default strategy for git-pull. 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-r…
Junio C Hamano
Use 'merge-base --all' where applicable. 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>
Junio C Hamano
Merge branch 'hold/svn'
Junio C Hamano
Merge branch 'hold/rpm'
Junio C Hamano
git-apply: do not fail on binary diff when not applying nor checking. 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>
Junio C Hamano
Update INSTALL 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>
Fredrik Kuivinen
merge-recursive: Fix support for branch names containing slashes 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>
Fredrik Kuivinen
merge-recursive: Fix limited output of rename messages 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>
Alexander Litvinov
Fix cvsexportcommit syntax error There is a syntax error in cvsexport script: Signed-off-by: Junio C Hamano <junkio@cox.net>
Luck, Tony
Update howto using-topic-branches "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>
Peter Hagervall
sparse fixes for http-{fetch,push}.c 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>
Kai Ruemmler
git-tag -d <tag>: delete tag <tag> 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>
Alex Riesen
make tests ignorable with "make -i" 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... cyg…
Alex Riesen
fix t5000-tar-tree.sh when $TAR isn't set $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>
Junio C Hamano
Clean build annoyance. 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>
Junio C Hamano
GIT 0.99.9f Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v0.99.9f
Jim Radford
Separate RPMS for programs with non-standard dependencies. Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix a couple of obvious and insignificant typo. Signed-off-by: Junio C Hamano <junkio@cox.net>
Yaacov Akiba Slama
Lift the default limit of number of revs. 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>
Yaacov Akiba Slama
Handle a revision that only creates a new tag correctly. 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>
Yaacov Akiba Slama
Bundle file copies from multiple branches into a merge. 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>
  1. Prev
  2. Next