path: root/Documentation
AgeCommit message (Collapse)Author
2008-03-03Merge branch 'maint'Junio C Hamano
* maint: Update draft release notes for revert: actually check for a dirty index tests: introduce test_must_fail git-submodule: Fix typo 'url' which should be '$url' receive-pack: Initialize PATH to include exec-dir. Conflicts: builtin-revert.c
2008-03-03Update draft release notes for C Hamano
Signed-off-by: Junio C Hamano <>
2008-03-03Fix doc typos.Ralf Wildenhues
Signed-off-by: Ralf Wildenhues <> Signed-off-by: Junio C Hamano <>
2008-03-03Merge branch 'np/verify-pack'Junio C Hamano
* np/verify-pack: add storage size output to 'git verify-pack -v' fix unimplemented packed_object_info_detail() features make verify_one_pack() a bit less wrong wrt packed_git structure factorize revindex code out of builtin-pack-objects.c Conflicts: Makefile
2008-03-02Merge branch 'pb/cvsimport'Junio C Hamano
* pb/cvsimport: cvsimport: document that -M can be used multiple times cvsimport: allow for multiple -M options cvsimport: have default merge regex allow for dashes in the branch name
2008-03-02Merge branch 'mk/maint-parse-careful'Junio C Hamano
* mk/maint-parse-careful: receive-pack: use strict mode for unpacking objects index-pack: introduce checking mode unpack-objects: prevent writing of inconsistent objects unpack-object: cache for non written objects add common fsck error printing function builtin-fsck: move common object checking code to fsck.c builtin-fsck: reports missing parent commits Remove unused object-ref code builtin-fsck: move away from object-refs to fsck_walk add generic, type aware object chain walker Conflicts: Makefile builtin-fsck.c
2008-03-02Merge branch 'sb/describe-long'Junio C Hamano
* sb/describe-long: git-describe: --long shows the object name even for a tagged commit
2008-03-02Documentation: Remove --{min,max}-age option from git-log(1)Jakub Narebski
The --max-age=<timestamp> and --min-age=<timestamp> are now shown only in the git-rev-list manpage (plumbing). Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2008-03-02Documentation/git-rebase.txt: Add --strategy to synopsysMike Hommey
Signed-off-by: Mike Hommey <> Signed-off-by: Junio C Hamano <>
2008-03-02CodingGuidelines: spell out how we use grep in our scriptsJunio C Hamano
Our scripts try to stick to fairly limited subset of POSIX BRE for portability. It is unclear from manual page from GNU grep which is GNU extension and which is portable, so let's spell it out to help new people to keep their contributions from hurting porters. Signed-off-by: Junio C Hamano <>
2008-03-01add storage size output to 'git verify-pack -v'Nicolas Pitre
This can possibly break external scripts that depend on the previous output, but those script can't possibly be critical to Git usage, and fixing them should be trivial. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
2008-03-01gc: Add --quiet optionFrank Lichtenheld
Pass -q option to git-repack. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2008-03-01cvsimport: document that -M can be used multiple timesPhilippe Bruhat (BooK
Also document the capture behaviour (source branch name in $1) Signed-off-by: Philippe Bruhat (BooK) <> Signed-off-by: Junio C Hamano <>
2008-03-01Merge branch 'maint'Junio C Hamano
* maint: Documentation cherry-pick: Fix cut-and-paste error git.el: find the git-status buffer whatever its name is git-gui: Paper bag fix info dialog when no files are staged at commit
2008-03-01Documentation cherry-pick: Fix cut-and-paste errorMike Ralphson
Signed-off-by: Mike Ralphson <> Signed-off-by: Junio C Hamano <>
2008-02-29Update draft release notes for 1.5.5Junio C Hamano
Signed-off-by: Junio C Hamano <>
2008-02-29rev-list: add --branches, --tags and --remotesUwe Kleine-König
These flags are already known to rev-parse and have the same meaning. This patch allows to run gitk as follows: gitk --branches --not --remotes to show only your local work. Signed-off-by: Uwe Kleine-König <> Signed-off-by: Junio C Hamano <>
2008-02-29Merge branch 'maint'Junio C Hamano
* maint: templates/Makefile: don't depend on local umask setting Correct name of diff_flush() in API documentation Start preparing for Conflicts: RelNotes
2008-02-29receive-pack: use strict mode for unpacking objectsMartin Koegler
Signed-off-by: Martin Koegler <> Signed-off-by: Junio C Hamano <>
2008-02-29index-pack: introduce checking modeMartin Koegler
Adds strict option, which bails out if the pack would introduces broken object or links in the repository. Signed-off-by: Martin Koegler <> Signed-off-by: Junio C Hamano <>
2008-02-29unpack-objects: prevent writing of inconsistent objectsMartin Koegler
This patch introduces a strict mode, which ensures that: - no malformed object will be written - no object with broken links will be written The patch ensures this by delaying the write of all non blob object. These object are written, after all objects they link to are written. An error can only result in unreferenced objects. Signed-off-by: Martin Koegler <> Signed-off-by: Junio C Hamano <>
2008-02-28Correct name of diff_flush() in API documentationDaniel Barkalow
Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2008-02-28Start preparing for C Hamano
Signed-off-by: Junio C Hamano <>
2008-02-27Merge branch 'maint'Junio C Hamano
* maint: Eliminate confusing "won't bisect on seeked tree" failure builtin-reflog.c: don't install new reflog on write failure send-email: fix In-Reply-To regression Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR Prompt to continue when editing during rebase --interactive Documentation/git svn log: add a note about timezones. Don't use GIT_CONFIG in t5505-remote Conflicts: t/ t/
2008-02-27Merge branch 'js/branch-track'Junio C Hamano
* js/branch-track: doc: documentation update for the branch track changes branch: optionally setup branch.*.merge from upstream local branches Conflicts: Documentation/config.txt Documentation/git-branch.txt Documentation/git-checkout.txt builtin-branch.c cache.h t/
2008-02-27Merge branch 'db/cover-letter'Junio C Hamano
* db/cover-letter: Improve collection of information for format-patch --cover-letter Add API access to shortlog t4014: Replace sed's non-standard 'Q' by standard 'q' Support a --cc=<email> option in format-patch Combine To: and Cc: headers Fix format.headers not ending with a newline Add tests for extra headers in format-patch Add a --cover-letter option to format-patch Export some email and pretty-printing functions Improve message-id generation flow control for format-patch Add more tests for format-patch Conflicts: builtin-log.c builtin-shortlog.c pretty.c
2008-02-27Merge branch 'jc/diff-relative'Junio C Hamano
* jc/diff-relative: diff --relative: help working in a bare repository diff --relative: output paths as relative to the current subdirectory
2008-02-27Merge branch 'db/host-alias'Junio C Hamano
* db/host-alias: url rewriting: take longest and first match Add support for url aliases in config files Use ALLOC_GROW in remote.{c,h}
2008-02-27Merge branch 'ae/pack-autothread'Junio C Hamano
* ae/pack-autothread: Revert "pack-objects: Print a message describing the number of threads for packing" pack-objects: Print a message describing the number of threads for packing pack-objects: Add runtime detection of online CPU's
2008-02-27Merge branch 'sp/describe'Junio C Hamano
* sp/describe: Use git-describe --exact-match in bash prompt on detached HEAD Teach git-describe --exact-match to avoid expensive tag searches Avoid accessing non-tag refs in git-describe unless --all is requested Teach git-describe to use peeled ref information when scanning tags Optimize peel_ref for the current ref of a for_each_ref callback
2008-02-27Documentation/git svn log: add a note about timezones.Miklos Vajna
git svn log mimics the timezone converting behaviour of svn log, but this was undocumented. Signed-off-by: Miklos Vajna <> Signed-off-by: Junio C Hamano <>
2008-02-27Add '--fixed-strings' option to "git log --grep" and friendsJakub Narebski
Add support for -F | --fixed-strings option to "git log --grep" and friends: "git log --author", "git log --committer=<pattern>". Code is based on implementation of this option in "git grep". Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2008-02-26Merge branch 'maint'Junio C Hamano
* maint: Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest timezone_names[]: fixed the tz offset for New Zealand. filter-branch documentation: non-zero exit status in command abort the filter rev-parse: fix potential bus error with --parseopt option spec handling Use a single implementation and API for copy_file() Documentation/git-filter-branch: add a new msg-filter example Correct fast-export file mode strings to match fast-import standard
2008-02-26Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotestBryan Donlan
Signed-off-by: Bryan Donlan <> Signed-off-by: Junio C Hamano <>
2008-02-26filter-branch documentation: non-zero exit status in command abort the filterCaio Marcelo de Oliveira Filho
Since commit 8c1ce0f46b85d40f215084eed7313896300082df filter-branch fails when a <command> has a non-zero exit status. This commit makes it clear in the documentation and also fixes the parent-filter example, that was incorrectly returning non-zero when the commit being tested wasn't the one to be rewritten. Signed-off-by: Caio Marcelo de Oliveira Filho <> Signed-off-by: Junio C Hamano <>
2008-02-26git-describe: --long shows the object name even for a tagged commitSanti Béjar
This is useful when you want to see parts of the commit object name in "describe" output, even when the commit in question happens to be a tagged version. Instead of just emitting the tag name, it will describe such a commit as v1.2-0-deadbeef (0th commit since tag v1.2 that points at object deadbeef....). Signed-off-by: Santi Béjar <> Signed-off-by: Junio C Hamano <>
2008-02-25Documentation/git-filter-branch: add a new msg-filter exampleMiklos Vajna
There were no example on how to edit commit messages, so add an msg-filter example. Signed-off-by: Miklos Vajna <> Signed-off-by: Junio C Hamano <>
2008-02-25url rewriting: take longest and first matchJunio C Hamano
Earlier we had a cop-out in the documentation to make the behaviour "undefined" if configuration had more than one insteadOf that would match the target URL, like this: [url "git://"] insteadOf = "" ; (1) insteadOf = "" ; (2) [url "/local/mirror/"] insteadOf = "" ; (3) insteadOf = "" ; (4) It would be most natural to take the longest and first match, i.e. - rewrite "" to "git://" by using (1), - rewrite "" to "/local/mirror/xyzzy" by favoring (3) over (1), and - rewrite "" to "git://" by favoring (2) over (4). Signed-off-by: Junio C Hamano <>
2008-02-25Add support for url aliases in config filesDaniel Barkalow
This allows users with different preferences for access methods to the same remote repositories to rewrite each other's URLs by pattern matching across a large set of similiarly set up repositories to each get the desired access. For example, if you don't have a account, you might want settings like: [url "git://"] insteadOf = Then, if you give git a URL like: it will act like you gave it: git:// and you can cut-and-paste pull requests in email without fixing them by hand, for example. Signed-off-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2008-02-25git-bundle.txt: Add different strategies to create the bundleSanti Béjar
Signed-off-by: Santi Béjar <> Signed-off-by: Junio C Hamano <>
2008-02-25Merge branch 'jc/apply-whitespace'Junio C Hamano
* jc/apply-whitespace: ws_fix_copy(): move the whitespace fixing function to ws.c apply: do not barf on patch with too large an offset core.whitespace: cr-at-eol git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run builtin-apply.c: pass ws_rule down to match_fragment() builtin-apply.c: move copy_wsfix() function a bit higher. builtin-apply.c: do not feed copy_wsfix() leading '+' builtin-apply.c: simplify calling site to apply_line() builtin-apply.c: clean-up apply_one_fragment() builtin-apply.c: mark common context lines in lineinfo structure. builtin-apply.c: optimize match_beginning/end processing a bit. builtin-apply.c: make it more line oriented builtin-apply.c: push match-beginning/end logic down builtin-apply.c: restructure "offset" matching builtin-apply.c: refactor small part that matches context
2008-02-24Teach git-describe --exact-match to avoid expensive tag searchesShawn O. Pearce
Sometimes scripts want (or need) the annotated tag name that exactly matches a specific commit, or no tag at all. In such cases it can be difficult to determine if the output of `git describe $commit` is a real tag name or a tag+abbreviated commit. A common idiom is to run git-describe twice: if test $(git describe $commit) = $(git describe --abbrev=0 $commit) ... but this is a huge waste of time if the caller is just going to pick a different method to describe $commit or abort because it is not exactly an annotated tag. Setting the maximum number of candidates to 0 allows the caller to ask for only a tag that directly points at the supplied commit, or to have git-describe abort if no such item exists. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2008-02-23pack-objects: Add runtime detection of online CPU'sAndreas Ericsson
Packing objects can be done in parallell nowadays, but it's only done if the config option pack.threads is set to a value above 1. Because of that, the code-path used is often not the most optimal one. This patch adds a routine to detect the number of online CPU's at runtime (online_cpus()). When pack.threads (or --threads=) is given a value of 0, the number of threads is set to the number of online CPU's. This feature is also documented. As per Nicolas Pitre's recommendations, the default is still to run pack-objects single-threaded unless explicitly activated, either by configuration or by command line parameter. The routine online_cpus() is a rework of "numcpus.c", written by one Philip Willoughby <>. numcpus.c is in the public domain and can presently be downloaded from Signed-off-by: Andreas Ericsson <> Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2008-02-23Sync with C Hamano
Signed-off-by: Junio C Hamano <>
2008-02-23GIT C Hamano
Signed-off-by: Junio C Hamano <>
2008-02-22git-merge-index documentation: clarify synopsisGerrit Pape
The options following <merge-program> are not -a, --, or <file>..., but either -a, or -- <file>..., while -- is optional. Signed-off-by: Gerrit Pape <> Signed-off-by: Junio C Hamano <>
2008-02-21Teach git-grep --name-only as synonym for -lShawn O. Pearce
I expected git grep --name-only to give me only the file names, much as git diff --name-only only generates filenames. Alas the option is -l, which matches common external greps but doesn't match other parts of the git UI. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2008-02-21Merge branch 'mk/color'Junio C Hamano
* mk/color: Add color.ui variable which globally enables colorization if set
2008-02-21Merge branch 'maint'Junio C Hamano
* maint: Clarified the meaning of git-add -u in the documentation properly configure remote even if remote's head is dangling Documentation/git-stash: document options for git stash list send-email: squelch warning due to comparing undefined $_ to ""
2008-02-21Clarified the meaning of git-add -u in the documentationPekka Kaitaniemi
The git-add documentation did not state clearly that the -u switch updates only the tracked files that are in the current directory and its subdirectories. Signed-off-by: Pekka Kaitaniemi <> Signed-off-by: Junio C Hamano <>