aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* git-format-patch: the default suffix is now .patch, not .txtJunio C Hamano2007-01-17
| | | | | | | Editors often give easier handling of patch files if the filename ends with .patch, so use it instead of .txt. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-format-patch: make --binary on by defaultJunio C Hamano2007-01-17
| | | | | | | | It does not make much sense to generate a patch that cannot be applied. If --text is specified on the command line it still takes precedence. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add --summary to git-format-patch by defaultJunio C Hamano2007-01-17
| | | | | | | | | | This adds --summary output in addition to the --stat to the output from git-format-patch by default. I think additions, removals and filemode changes are rare but notable events and always showing it makes sense. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-format-patch -3Junio C Hamano2007-01-17
| | | | | | | | | | This teaches "git-format-patch" to honor the --max-count parameter revision traversal machinery takes, so that you can say "git-format-patch -3" to process the three topmost commits from the current HEAD (or "git-format-patch -2 topic" to name a specific branch). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document pack .idx file format upgrade strategy.Shawn O. Pearce2007-01-17
| | | | | | | | | | | | | | | | | | | | | | | | Way back when Junio developed the 64 bit index topic he came up with a means of changing the .idx file format so that older Git clients would recognize that they don't understand the file and refuse to read it, while newer clients could tell the difference between the old-style and new-style .idx files. Unfortunately this wasn't recorded anywhere. This change documents how we might go about changing the .idx file format by using a special signature in the first four bytes. Credit (and possible blame) goes completely to Junio for thinking up this technique. The change also modifies the error message of the current Git code so that users get a recommendation to upgrade their Git software should this version or later encounter a new-style .idx which it cannot process. We already do this for the .pack files, but since we usually process the .idx files first its important that these files are recognized and encourage an upgrade. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Refer users to git-rev-parse for revision specification syntax.Shawn O. Pearce2007-01-17
| | | | | | | | | | The revision specification syntax (sometimes referred to as SHA1-expressions) is accepted almost everywhere in Git by almost every tool. Unfortunately it is only documented in git-rev-parse.txt, and most users don't know to look there. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the master@{n} reflog query syntax.Shawn O. Pearce2007-01-17
| | | | | | | | | In ab2a1a32 Junio improved the reflog query logic to support obtaining the n-th prior value of a ref, but this was never documented in git-rev-parse. Now it is. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-parse-remote.txt: we deal with config vars as wellJunio C Hamano2007-01-17
| | | | | | ... but we never documented it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: m can be relative in "git-blame -Ln,m"Junio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: suggest corresponding Porcelain-level in plumbing docs.Junio C Hamano2007-01-17
| | | | | | | | Instead of keeping the confused end user reading low-level documentation, suggest the higher level commands that implement what the user may want to do using them upfront. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-resolve: deprecated.Junio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* sanitize content of README fileNicolas Pitre2007-01-17
| | | | | | | | | | | | Current README content is way too esoteric for someone looking at GIT for the first time. Instead it should provide a quick summary of what GIT is with a few pointers to other resources. The bulk of the previous README content is moved to Documentation/core-intro.txt. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-format-patch: do not crash with format.headers without value.Junio C Hamano2007-01-17
| | | | | | | | | | | An incorrect config file can say: [format] headers and crash the parsing. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Introduce 'git-format-patch --suffix=.patch'Junio C Hamano2007-01-17
| | | | | | | The default can also be changed with "format.suffix" configuration. Leaving it empty would not add any suffix. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/glossary.txt: describe remotes/ tracking and packed-refsJunio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/glossary.txt: unpacked objects are loose.Junio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: describe shallow repositoryJunio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"Junio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: detached HEADJunio C Hamano2007-01-17
| | | | | | | Add discussion section to git-checkout documentation and mention detached HEAD in repository-layout document. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: a few spelling fixesRené Scharfe2007-01-17
| | | | | Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-sh-setup.txt: programmer's docsJunio C Hamano2007-01-17
| | | | | | | Clarify that this is not meant for end users, and list what shell functions are defined. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-whatchanged.txt: show -<n> instead of --max-count.Junio C Hamano2007-01-17
| | | | | | ... to match the change we did earlier to git-log documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-status.txt: mention color configurationJunio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-tar-tree.txt: default umask is now 002Junio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-tools.txt: mention tig and refer to wikiJunio C Hamano2007-01-17
| | | | | | | In general list at Wiki seems to be maintained a lot better than this list. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-tag: the command can be used to also verify a tag.Junio C Hamano2007-01-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/SubmittingPatches: Gnus tipsJunio C Hamano2007-01-17
| | | | | | Also warn about format=flowed (aka 'flawed'). Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-commit: document log message formatting conventionJunio C Hamano2007-01-16
| | | | | | Take it from the tutorial, since not everybody necessarily reads it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* cache.h; fix a couple of prototypesChris Wedgwood2007-01-16
| | | | | | Trivial patch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document where configuration files are in config.txtJunio C Hamano2007-01-16
| | | | | | | Talking about what the files contain without talking about where they are does not help new users. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use merge-recursive in git-checkout -m (branch switching)Junio C Hamano2007-01-16
| | | | | | | This allows "git checkout -m <other-branch>" to notice renames and carry local changes in the working tree forward. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-commit documentation: remove comment on unfixed git-rmJunio C Hamano2007-01-16
| | | | | | ... which was fixed since then. Signed-off-by: Junio C Hamano <junkio@cox.net>
* tutorial: shorthand for remotes but show distributed nature of gitJunio C Hamano2007-01-16
| | | | | | | | | | | * Promiscous pull shows the distributed nature of git better. * Add a new step after that to teach "remote add". * Highlight that with the shorthand defined you will get remote tracking branches for free. * Fix Alice's workflow. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* tutorial: Use only separate layoutSanti Béjar2007-01-16
| | | | | | | Then the newbies only have to understand one layout. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix spurious compile errorJohannes Schindelin2007-01-16
| | | | | | | | | | | | | | | | | | | From time to time, I would get this error: [...] sed: -e expression #8, char 41: Unterminated `s' command make: *** [git-add--interactive] Error 1 Turns out that the function WriteMakefile() called in Makefile.PL outputs the message "Writing perl.mak for Git" to stdout! Thus, the output of "make -C perl -s --no-print-directory instlibdir" would be prefixed by that message whenever Makefile.PL was newer than perl.mak. This is fixed by redirecting stdout to stderr in Makefile.PL. Signed-off-by: Johannes E. Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-rm documentation: remove broken behaviour from the example.Junio C Hamano2007-01-16
| | | | | | | The example section were talking about the old broken default behaviour. Correct it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-push documentation: remaining bitsJunio C Hamano2007-01-16
| | | | | | Mention --thin, --no-thin, --repo and -v. Signed-off-by: Junio C Hamano <junkio@cox.net>
* document --exec for git-pushUwe Kleine-K,Av(Bnig2007-01-16
| | | | | | | The text is just copied from git-send-pack.txt. Signed-off-by: Uwe Kleine-K,Av(Bnig <zeisberg@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: print and flush authentication prompts to STDERREric Wong2007-01-15
| | | | | | | | | | | | | | People that redirect STDOUT output should always see STDERR prompts interactively. STDERR should always be flushed without buffering, so they should always show up. If that is unset, we still explicitly flush by calling STDERR->flush. The svn command-line client prompts to STDERR, too. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Solaris 5.8 returns ENOTDIR for inappropriate renames.Jason Riedy2007-01-15
| | | | | | | | The reflog code clears empty directories when rename returns either EISDIR or ENOTDIR. Seems to be the only place. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Replace "echo -n" with printf in shell scripts.Jason Riedy2007-01-15
| | | | | | | | Not all echos know -n. This was causing a test failure in t5401-update-hooks.sh, but not t3800-mktag.sh for some reason. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Set _ALL_SOURCE for AIX, but avoid its struct list.Jason Riedy2007-01-15
| | | | | | | | AIX 5.3 seems to need _ALL_SOURCE for struct addrinfo, but that introduces a struct list in grp.h. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Start all test scripts with /bin/sh.Jason Riedy2007-01-15
| | | | | | | | My bash refused to run the two scripts missing a #!, and it's better to use the same line for all the scripts. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-pull: disallow implicit merging to detached HEADJeff King2007-01-15
| | | | | | | | | Instead, we complain to the user and suggest that they explicitly specify the remote and branch. We depend on the exit status of git-symbolic-ref, so let's go ahead and document that. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix git-fetch while on detached HEAD not to give needlessly alarming errorsJunio C Hamano2007-01-15
| | | | | | | | | | | | | | | | | When we are on a detached HEAD, there is no current branch. There is no reason to leak the error messages to the end user since this is a situation we expect to see. This adds -q option to git-symbolic-ref to exit without issuing an error message if the given name is not a symbolic ref. By the way, with or without this patch, there currently is no good way to tell failure modes between "git symbolic-ref HAED" and "git symbolic-ref HEAD". Both says "is not a symbolic ref". We may want to do something about it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git reflog expire: document --stale-fix option.Junio C Hamano2007-01-15
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2007-01-14
|\ | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] Make gitk work when launched in a subdirectory [PATCH] gitk: add current directory to main window title
| * [PATCH] Make gitk work when launched in a subdirectoryPeter Baumann2007-01-13
| | | | | | | | | | | | | | Make gitk use git-rev-parse --git-dir to find the repository. Signed-off-by: Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [PATCH] gitk: add current directory to main window titleDoug Maxey2007-01-13
| | | | | | | | | | | | | | | | This can help people keep track of which gitk is which, when they have several on the screen. Signed-off-by: Doug Maxey <dwm@enoyolf.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | Use nice names in conflict markers during cherry-pick/revert.Shawn O. Pearce2007-01-14
| | | | | | | | | | | | | | | | | | | | | | Always call the current HEAD 'HEAD', and name the patch being cherry-picked or reverted by its oneline subject rather than its SHA1. This matches git am's behavior and is done because users most commonly are cherry-picking by SHA1 rather than by ref name. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-02 16:57:49 +0000