Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
send-email: Identify author at the top when sending e-mail git-send-email did not check if the sender is the same as the patch author. Follow the "From: at the beginning" convention to propagate the patch author correctly. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
sha1_name: make core.warnambiguousrefs the default. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
sha1_name: warning ambiguous refs. This makes sure that many commands that take refs on the command line to honor core.warnambiguousrefs configuration. Earlier, the commands affected by this patch did not read the configuration file. Signed-off-by: Junio C Hamano <junkio@cox.net>
Francis Daly
Format tweaks for asciidoc. Some documentation "options" were followed by independent preformatted paragraphs. Now they are associated plain text paragraphs. The difference is clear in the generated html. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'jc/pull' into next * jc/pull: git-pull: reword "impossible to fast-forward" message. git-pull: further safety while on tracking branch.
Junio C Hamano
git-pull: reword "impossible to fast-forward" message. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-pull: further safety while on tracking branch. Running 'git pull' while on the tracking branch has a built-in safety valve to fast-forward the index and working tree to match the branch head, but it errs on the safe side too cautiously. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'jc/revlist' into next * jc/revlist: rev-list --timestamp git-apply: do not barf when updating an originally empty file. http-push.c: squelch C90 warnings. fix field width/precision warnings in blame.c
Junio C Hamano
Merge branch 'jc/clone' into next * jc/clone: git-clone: typofix.
Junio C Hamano
git-clone: typofix. The traditional one created refs/origin by mistake, not refs/heads/origin. Also it mistakenly failed to prevent $origin from being listed twice in remotes/origin file. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
rev-list --timestamp This prefixes the raw commit timestamp to the output. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-apply: do not barf when updating an originally empty file. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
http-push.c: squelch C90 warnings. If you write code after declarations in a block, gcc scolds you with "warning: ISO C90 forbids mixed declarations and code". Signed-off-by: Junio C Hamano <junkio@cox.net>
Luck, Tony
fix field width/precision warnings in blame.c Using "size_t" values for printf field width/precision upsets gcc, it wants to see an "int". Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras
gitk: Fix two bugs reported by users The first was a simple typo where I put $yc instead of [yc $row]. The second was that I broke the logic for keeping up with fast movement through the commits, e.g. when you select a commit and then press down-arrow and let it autorepeat. That got broken when I changed the merge diff display to use git-diff-tree --cc. Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano
Merge branch 'jc/clone' into next * jc/clone: clone: record the remote primary branch with remotes/$origin/HEAD
Junio C Hamano
Merge branch 'jc/name' into next * jc/name: get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
Junio C Hamano
clone: record the remote primary branch with remotes/$origin/HEAD This matches c51d13692d4e451c755dd7da3521c5db395df192 commit to record the primary branch of the remote with a symbolic ref remotes/$origin/HEAD. The user can later change it to point at different branch to change the meaning of "$origin" shorthand. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD This implements the suggestion by Jeff King to use refs/remotes/$foo/HEAD to interpret a shorthand "$foo" to mean the primary branch head of a tracked remote. clone needs to be told about this convention as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'jc/name' into next * jc/name: core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists. contrib/git-svn: allow rebuild to work on non-linear remote heads http-push: don't assume char is signed http-push: add support for deleting remote branches Be verbose when !initial commit Fix multi-paragraph list items in OPTIONS section http-fetch: nicer warning for a server with unr…
Junio C Hamano
Merge branch 'jc/clone' into next * jc/clone: revamp git-clone (take #2).
Junio C Hamano
revamp git-clone (take #2). This builds on top of the previous one. * --use-separate-remote uses .git/refs/remotes/$origin/ directory to keep track of the upstream branches. * The $origin above defaults to "origin" as usual, but the existing "-o $origin" option can be used to override it. I am not yet convinced if we should make "$origin" the synonym to "refs/remotes/$origin/$name" where $name is the primary branc…
Junio C Hamano
core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists. Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong
contrib/git-svn: allow rebuild to work on non-linear remote heads Because committing back to an SVN repository from different machines can result in different lineages, two different repositories running git-svn can result in different commit SHA1s (but of the same tree). Sometimes trees that are tracked independently are merged together (usually via children), resulting in non-unique git-svn-id: lines in rev-list. Signed-off-by: Eric Wong <normalperson@yhbt.n…
Nick Hengeveld
http-push: don't assume char is signed Declare remote_dir_exists[] as signed char to be sure that values of -1 are valid. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld
http-push: add support for deleting remote branches Processes new command-line arguments -d and -D to remove a remote branch if the following conditions are met: - one branch name is present on the command line - the specified branch name matches exactly one remote branch name - the remote HEAD is a symref - the specified branch is not the remote HEAD - the remote HEAD resolves to an object that exists locally (-d only) - the specified branch resol…
Yasushi SHOJI
Be verbose when !initial commit verbose option in git-commit.sh lead us to run git-diff-index, which needs a commit-ish we are making diff against. When we are commiting the fist set, we obviously don't have any commit-ish in the repo. So we just skip the git-diff-index run. It might be possible to produce diff against empty but do we need that? Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Ha…
Francis Daly
Fix multi-paragraph list items in OPTIONS section This patch makes the html docs right, makes the asciidoc docs a bit odd but consistent with what is there already, and makes the manpages look OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69. For the manpages, current is like -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> …
Junio C Hamano
http-fetch: nicer warning for a server with unreliable 404 status When a repository otherwise properly prepared is served by a dumb HTTP server that sends "No such page" output with 200 status for human consumption to a request for a page that does not exist, the users will get an alarming "File X corrupt" error message. Hint that they might be dealing with such a server at the end and suggest running fsck-objects to check if the result is OK (the pack-fallback…
Junio C Hamano
Merge branch 'jc/merge' into next * jc/merge: git-merge knows some strategies want to skip trivial merges generate-cmdlist: style cleanups. Add missing semicolon to sed command. unpack_delta_entry(): reduce memory footprint. git.el: Added a function to diff against the other heads in a merge. git.el: Get the default user name and email from the repository config. git.el: More robust handling of subprocess errors when…
  1. Prev
  2. Next