Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'master' of .
Junio C Hamano
Mention post-update when we first talk about publishing a repository. There is more detailed instruction for `project lead` later in the tutorial to talk about the same, but at this point in the flow of tutorial, the first time reader has no way of knowing it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
scripts: equality test '==' is not portable. On NetBSD 3 we trigger an error: [: ==: unexpected operator Double-equal is accepted by bash built-in '[' and bash(1) suggests using '=' for strict POSIX compliance (test(1) from coreutils does not mention '=='). Eradicate their uses everywhere. [jc: Somebody with a pseudonym kindly sent a message to let me know about the problem privately; I do not have access to a NetBSD box.] Signed-…
Junio C Hamano
git-checkout-script: Remove unnecessary variable. There was unused variable $i that counted the number of arguments being processed. Remove it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix automerge message. The rewrite done while adding the shorthand support made the remote refname recorded in the commit message too long for human consumption, while losing information by using the shorthand not the real URL to name the remote repository there. They were both bad changes done without enough thinking. Pointed out by Linus. Signed-off-by: Junio C Hamano <junkio@cox.net>
Amos Waterland
[PATCH] Explain what went wrong on update-cache of new file If somebody tries to run `git update-cache foo', where foo is a new file, git dies with a rather cryptic error message: fatal: Unable to add foo to database This trivial patch makes git explain what probably went wrong. It is not a perfect diagnosis of all error paths, but for 90% of the cases it should provide the user with the clue they need. [jc: I ended up wording slightly differently, an…
Junio C Hamano
Add repository-layout document. ... and link to it from both the main index and the tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge refs/heads/master from .
Junio C Hamano
Use 'git status' now it can handle initial commit. Update 'git commit' to use the updated `git status`. Also earlier the `-s` flag was ignored for the initial commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix git-status when HEAD is invalid. It tried to do git-diff-cache against HEAD, of course. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix git-log-script when HEAD is invalid. It used 'die' without including git-sh-setup-script; since everything it uses are subdirectory-aware, instead of including the script to force it to be run from the top, use echo & exit. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Add Pine 4.63 help from Daniel. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge refs/heads/master from .
Junio C Hamano
Update tutorial. Finally I bit the bullet and did a full sweep of this document. The changes are mostly clarifications, adjusting old terminology to the glossary compatible one, and asciidoc formatting. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
show-branch: make it work in a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net>
Martin Langhoff
[PATCH] Initial import of git-archimport-script Imports a project history from one or more Arch repositories, following the branching and tagging across repositories. Note you should import separate projects to separate GIT repositories. Supported - Imports, tags and simple commits. - File renames - Arch tags - Binary files - Large trees - Multiple repositories - Branches TODO: - Allow re-running the import on an already-imported proj…
Junio C Hamano
Merge refs/heads/master from .
Junio C Hamano
cat-file: make it work in a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 73244994ee4abd6e436e8a1d597dd917271d77a9 commit)
Junio C Hamano
Documentaion updates. Mostly making the formatted html prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit)
Junio C Hamano
'git bisect visualize' Linus says: I'm testing bisection to find a bug that causes my G5 to no longer boot, and during the process have found this command line very nice: gitk bisect/bad --not $(cd .git/refs ; ls bisect/good-*) it basically shows the state of bisection with the known bad commit as the top, and cutting off all the good commits - so what you see are the potential buggy commits.…
Linus Torvalds
[PATCH] Fix bisection terminating condition When testing bisection and using gitk to visualize the result, it was obvious that the termination condition was broken. We know what the bad entry is only when the bisection ends up telling us to test the known-bad entry again. Also, add a safety net: if somebody marks as good something that includes the known-bad point, we now notice and complain, instead of writing an empty revision to the ne…
Junio C Hamano
Merge refs/heads/master from .
Junio C Hamano
parse-remote: trivial fix to allow refs/{heads,tags}/ spelled easier. Earlier we always prefixed refs/heads to the token given to "git fetch" (and "git pull") as refspec. This was a mistake. Allow them to be spelled like "master:refs/tags/paulus" to mean "I want to fetch the master there and store it as my local "paulus" tag. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge refs/heads/master from paulus
Junio C Hamano
Make sure howto/*.html is built as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds
[PATCH] Make "git resolve" less scary When we resolve a merge between two branches, and it removes a file in the current branch, we notify the person doing the resolve with a big nice notice like Removing xyzzy which is all well and good. HOWEVER, we also do this when the file was actually removed in the current branch, and we're merging with another branch that didn't have it removed (or, indeed, if the other branch _did_ have it…
Junio C Hamano
Merge refs/heads/master from .
Junio C Hamano
Allow asciidoc formatted documentation in howto/ Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge refs/heads/master from .
Junio C Hamano
Add [HOWTO] revert/branch/rebase. Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next