summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
Commit message (Collapse)AuthorAgeFilesLines
* Git 2.1v2.1.0Junio C Hamano2014-08-151-0/+5
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Sync with 2.0.4Junio C Hamano2014-07-301-1/+2
|\ | | | | | | | | | | * maint: Git 2.0.4 commit --amend: test specifies authorship but forgets to check
| * Git 2.0.4v2.0.4Junio C Hamano2014-07-301-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with v2.0.3Junio C Hamano2014-07-231-2/+3
|\ \ | |/ | | | | | | | | | | * maint: Git 2.0.3 .mailmap: combine Stefan Beller's emails git.1: switch homepage for stats
| * Git 2.0.3v2.0.3Junio C Hamano2014-07-231-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * git.1: switch homepage for statsStefan Beller2014-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | According to http://meta.ohloh.net/2014/07/black-duck-open-hub/ the site name of ohloh changed to openhub. Change the man page accordingly. Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'kb/perf-trace'Junio C Hamano2014-07-221-18/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * kb/perf-trace: api-trace.txt: add trace API documentation progress: simplify performance measurement by using getnanotime() wt-status: simplify performance measurement by using getnanotime() git: add performance tracing for git's main() function to debug scripts trace: add trace_performance facility to debug performance issues trace: add high resolution timer function to debug performance issues trace: add 'file:line' to all trace output trace: move code around, in preparation to file:line output trace: add current timestamp to all trace output trace: disable additional trace output for unit tests trace: add infrastructure to augment trace output with additional info sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace API Documentation/git.txt: improve documentation of 'GIT_TRACE*' variables trace: improve trace performance trace: remove redundant printf format attribute trace: consistently name the format parameter trace: move trace declarations from cache.h to new trace.h
| * | git: add performance tracing for git's main() function to debug scriptsKarsten Blees2014-07-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use trace_performance to measure and print execution time and command line arguments of the entire main() function. In constrast to the shell's 'time' utility, which measures total time of the parent process, this logs all involved git commands recursively. This is particularly useful to debug performance issues of scripted commands (i.e. which git commands were called with which parameters, and how long did they execute). Due to git's deliberate use of exit(), the implementation uses an atexit routine rather than just adding trace_performance_since() at the end of main(). Usage example: > GIT_TRACE_PERFORMANCE=~/git-trace.log git stash list Creates a log file like this: 23:57:38.638765 trace.c:405 performance: 0.000310107 s: git command: 'git' 'rev-parse' '--git-dir' 23:57:38.644387 trace.c:405 performance: 0.000261759 s: git command: 'git' 'rev-parse' '--show-toplevel' 23:57:38.646207 trace.c:405 performance: 0.000304468 s: git command: 'git' 'config' '--get-colorbool' 'color.interactive' 23:57:38.648491 trace.c:405 performance: 0.000241667 s: git command: 'git' 'config' '--get-color' 'color.interactive.help' 'red bold' 23:57:38.650465 trace.c:405 performance: 0.000243063 s: git command: 'git' 'config' '--get-color' '' 'reset' 23:57:38.654850 trace.c:405 performance: 0.025126313 s: git command: 'git' 'stash' 'list' Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace APIKarsten Blees2014-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes GIT_TRACE_PACK_ACCESS functionality as follows: * supports the same options as GIT_TRACE (e.g. printing to stderr) * no longer supports relative paths * appends to the trace file rather than overwriting Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Documentation/git.txt: improve documentation of 'GIT_TRACE*' variablesKarsten Blees2014-07-131-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate GIT_TRACE description into what it prints and how to configure where trace output is printed to. Change other GIT_TRACE_* descriptions to refer to GIT_TRACE. Add descriptions for GIT_TRACE_SETUP and GIT_TRACE_SHALLOW. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 2.0.2Junio C Hamano2014-07-161-1/+2
|\ \ \ | | |/ | |/| | | | | | | | | | * maint: Git 2.0.2 annotate: use argv_array
| * | Git 2.0.2v2.0.2Junio C Hamano2014-07-161-1/+2
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with maintJunio C Hamano2014-06-251-1/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Git 2.0.1v2.0.1Junio C Hamano2014-06-251-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'jj/command-line-adjective'Junio C Hamano2014-06-061-4/+4
|\ \ | |/ |/| | | | | * jj/command-line-adjective: Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
| * Documentation: use "command-line" when used as a compound adjective, and fix ↵jj/command-line-somethingjj/command-line-adjectiveJason St. John2014-05-211-4/+4
| | | | | | | | | | | | | | other minor grammatical issues Signed-off-by: Jason St. John <jstjohn@purdue.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.9.4Junio C Hamano2014-05-301-1/+2
|\ \
| * | Git 1.9.4v1.9.4Junio C Hamano2014-05-301-1/+2
| | | | | | | | | | | | | | | | | | | | | This is expected to be the final maintenance release for 1.9 series, merging the remaining fixes that are relevant and are already in 2.0. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 2.0v2.0.0Junio C Hamano2014-05-281-0/+5
| |/ |/|
* | Sync with 1.9.3Junio C Hamano2014-05-091-1/+2
|\ \ | |/
| * Git 1.9.3v1.9.3Junio C Hamano2014-05-091-1/+2
| | | | | | | | | | | | | | The third maintenance release for Git 1.9; contains all the fixes that are scheduled to appear in Git 2.0 since 1.9.2. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.9.2Junio C Hamano2014-04-091-1/+2
|\ \ | |/ | | | | | | | | * maint: Git 1.9.2 doc/http-backend: missing accent grave in literal mark-up
| * Git 1.9.2v1.9.2Junio C Hamano2014-04-091-1/+2
| | | | | | | | | | | | | | The second maintenance release for Git 1.9; contains all the fixes that are scheduled to appear in Git 2.0. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.9.1Junio C Hamano2014-03-181-1/+2
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.9.1v1.9.1Junio C Hamano2014-03-181-1/+2
| | | | | | | | | | | | | | | | | | The version numbering scheme has changed since Git 1.9 and we dropped the third dewey-decimal from the traditional numbering (e.g. both 1.8.4 and 1.8.5 were major feature releases). This release 1.9.1 is the first maintenance relase for Git 1.9. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | introduce GIT_INDEX_VERSION environment variableThomas Gummerer2014-02-241-0/+5
|/ | | | | | | | | | | | Respect a GIT_INDEX_VERSION environment variable, when a new index is initialized. Setting the environment variable will not cause existing index files to be converted to another format, but will only affect newly written index files. This can be used to initialize repositories with index-v4. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.9.0v1.9.0Junio C Hamano2014-02-141-0/+5
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Sync with 1.8.5.5Junio C Hamano2014-02-131-1/+2
|\ | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.8.5.5v1.8.5.5Junio C Hamano2014-02-131-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.8.5.4Junio C Hamano2014-02-051-1/+2
|\ \ | |/
| * Git 1.8.5.4v1.8.5.4Junio C Hamano2014-02-051-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.8.5.3Junio C Hamano2014-01-131-1/+2
|\ \ | |/ | | | | | | | | * maint: Git 1.8.5.3 pack-heuristics.txt: mark up the file header properly
| * Git 1.8.5.3v1.8.5.3Junio C Hamano2014-01-131-1/+2
| |
* | Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-271-0/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | Show the total number of paths and the number of paths shown so far when "git difftool" prompts to launch an external diff tool, which would give users some sense of progress. * zk/difftool-counts: diff.c: fix some recent whitespace style violations difftool: display the number of files in the diff queue in the prompt
| * difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When --prompt option is set, git-difftool displays a prompt for each modified file to be viewed in an external diff program. At that point, it could be useful to display a counter and the total number of files in the diff queue. Below is the current difftool prompt for the first of 5 modified files: Viewing: 'diff.c' Launch 'vimdiff' [Y/n]: Consider the modified prompt: Viewing (1/5): 'diff.c' Launch 'vimdiff' [Y/n]: The current GIT_EXTERNAL_DIFF mechanism does not tell the number of paths in the diff queue nor the current counter. To make this "counter/total" info available for GIT_EXTERNAL_DIFF programs without breaking existing ones by doing the following: - Keep track of the number of paths shown so far in diff_options; - Export two new environment variables from run_external_diff() to show the total number of paths (from diff_queue_struct) and the current value of the counter (from diff_options); and - Update git-difftool--helper to use these two environment variables. Signed-off-by: Zoltan Klinger <zoltan.klinger@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.8.5.2v1.8.5.2Junio C Hamano2013-12-171-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.8.5.1v1.8.5.1Junio C Hamano2013-12-031-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.8.4.5Junio C Hamano2013-12-021-1/+2
|\ \ | |/ |/|
| * Git 1.8.4.5v1.8.4.5maint-1.8.4Junio C Hamano2013-12-021-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.8.5v1.8.5Junio C Hamano2013-11-271-0/+5
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.8.4.4Junio C Hamano2013-11-201-1/+2
|\ \ | |/
| * Git 1.8.4.4v1.8.4.4Junio C Hamano2013-11-201-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.8.4.3Junio C Hamano2013-11-081-1/+2
|\ \ | |/
| * Git 1.8.4.3v1.8.4.3Junio C Hamano2013-11-081-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with v1.8.4.2Junio C Hamano2013-10-281-1/+2
|\ \ | |/
| * Git 1.8.4.2v1.8.4.2Junio C Hamano2013-10-281-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'jc/reflog-doc'Junio C Hamano2013-10-181-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Document rules to use GIT_REFLOG_ACTION variable in the scripted Porcelain. git-rebase--interactive locally violates them, but it is a leaf user that does not call out to or dot-source other scripts, so it does not urgently need to be fixed. * jc/reflog-doc: setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
| * | setup_reflog_action: document the rules for using GIT_REFLOG_ACTIONjc/reflog-docJunio C Hamano2013-06-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set_reflog_action helper (in git-sh-setup) is designed to be used once at the very top of a program, like this in "git am", for example: set_reflog_action am The helper function sets the given string to GIT_REFLOG_ACTION only when GIT_REFLOG_ACTION is not yet set. Thanks to this, "git am", when run as the top-level program, will use "am" in GIT_REFLOG_ACTION and the reflog entries made by whatever it does will record the updates of refs done by "am". Because of the conditional assignment, when "git am" is run as a subprogram (i.e. an implementation detail) of "git rebase" that already sets GIT_REFLOG_ACTION to its own name, the call in "git am" to the helper function at the beginning will *not* have any effect. So "git rebase" can do this: set_reflog_action rebase ... do its own preparation, like checking out "onto" commit ... decide to do "format-patch" to "am" pipeline git format-patch --stdout >mbox git am mbox and the reflog entries made inside "git am" invocation will say "rebase", not "am". Calls to "git" commands that update refs would use GIT_REFLOG_ACTION to record who did that update. Most such calls in scripted Porcelains do not define custom reflog message and rely on GIT_REFLOG_ACTION to contain its (or its caller's, when it is called as a subprogram) name. If a scripted Porcelain wants to record a custom reflog message for a single invocation of "git" command (e.g. when "git rebase" uses "git checkout" to detach HEAD at the commit a series is to be replayed on), it needs to set GIT_REFLOG_ACTION to the custom message and export it while calling the "git" command, but such an assignment must be restricted to that single "git" invocation and should not be left behind to affect later codepath. Document the rules to avoid future confusion. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git.txt: fix asciidoc syntax of --*-pathspecsSteffen Prohaska2013-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labeled lists require a double colon. [jc] I eyeballed the output from git grep '[^:]:$' Documentation/\*.txt and the patch fixes all breakages of this kind. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with Git 1.8.4.1Jonathan Nieder2013-09-261-1/+2
|\ \ \ | | |/ | |/|
View Lorry Controller Status