summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2008-05-26Merge branch 'jc/diff-no-no-index'Libravatar Junio C Hamano1-4/+1
* jc/diff-no-no-index: git diff --no-index: default to page like other diff frontends git-diff: allow --no-index semantics a bit more "git diff": do not ignore index without --no-index diff-files: do not play --no-index games tests: do not use implicit "git diff --no-index"
2008-05-26Merge branch 'maint'Libravatar Junio C Hamano1-10/+12
* maint: Documentation: fix graph in git-rev-parse.txt show-branch --current: do not barf on detached HEAD
2008-05-26Merge branch 'gp/bisect-fix' into maintLibravatar Junio C Hamano1-1/+1
* gp/bisect-fix: bisect: print an error message when "git rev-list --bisect-vars" fails git-bisect.sh: don't accidentally override existing branch "bisect"
2008-05-26Documentation: fix graph in git-rev-parse.txtLibravatar Michele Ballabio1-10/+12
Preformatted html and man pages show a mangled graph, caused by a backslash. Commit f1ec6b22a8c1ab1cca0f1875f85aea5d2434e5a6 fixed this same issue, but it seems that new versions of the Asciidoc toolchain changed their behaviour. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-25Documentation/git.txt: link to 1.5.5.2 documentation.Libravatar Junio C Hamano1-1/+2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-25Merge branch 'maint'Libravatar Junio C Hamano1-0/+27
* maint: builtin-fast-export: Only output a single parent per line Release Notes for 1.5.5.2 Conflicts: RelNotes
2008-05-25Release Notes for 1.5.5.2Libravatar Junio C Hamano1-0/+27
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-25Update draft release notes for 1.5.6Libravatar Junio C Hamano1-1/+48
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-25Merge branch 'as/graph'Libravatar Junio C Hamano1-1/+1
* as/graph: get_revision(): honor the topo_order flag for boundary commits Fix output of "git log --graph --boundary" log --graph --left-right: show left/right information in place of '*' graph API: don't print branch lines for uninteresting merge parents graph API: fix graph mis-alignment after uninteresting commits
2008-05-25Merge branch 'ar/batch-cat'Libravatar Junio C Hamano2-6/+42
* ar/batch-cat: change quoting in test t1006-cat-file.sh builtin-cat-file.c: use parse_options() git-svn: Speed up fetch Git.pm: Add hash_and_insert_object and cat_blob Git.pm: Add command_bidi_pipe and command_close_bidi_pipe git-hash-object: Add --stdin-paths option Add more tests for git hash-object Move git-hash-object tests from t5303 to t1007 git-cat-file: Add --batch option git-cat-file: Add --batch-check option git-cat-file: Make option parsing a little more flexible git-cat-file: Small refactor of cmd_cat_file Add tests for git cat-file
2008-05-25Merge branch 'ap/svn'Libravatar Junio C Hamano1-0/+10
* ap/svn: git-svn: add test for --add-author-from and --use-log-author git-svn: add documentation for --add-author-from option. git-svn: Add --add-author-from option. git-svn: add documentation for --use-log-author option.
2008-05-25Merge branch 'js/cvsexportcommit'Libravatar Junio C Hamano1-1/+6
* js/cvsexportcommit: cvsexportcommit: introduce -W for shared working trees (between Git and CVS) cvsexportcommit: chomp only removes trailing whitespace Conflicts: git-cvsexportcommit.perl
2008-05-25Merge branch 'js/ignore-submodule'Libravatar Junio C Hamano2-0/+8
* js/ignore-submodule: Ignore dirty submodule states during rebase and stash Teach update-index about --ignore-submodules diff options: Introduce --ignore-submodules
2008-05-25Merge branch 'mo/cvsserver'Libravatar Junio C Hamano2-11/+47
* mo/cvsserver: Documentation: Fix skipped section level git-cvsserver: add ability to guess -kb from contents implement gitcvs.usecrlfattr git-cvsserver: add mechanism for managing working tree and current directory
2008-05-25log --graph --left-right: show left/right information in place of '*'Libravatar Adam Simpkins1-1/+1
With the --graph option, the graph already outputs 'o' instead of '*' for boundary commits. Make it emit '<' or '>' when --left-right is specified. (This change also disables the '^' prefix for UNINTERESTING commits. The graph code currently doesn't print anything special for these commits, since it assumes no UNINTERESTING, non-BOUNDARY commits are displayed. This is potentially a bug if UNINTERESTING non-BOUNDARY commits can actually be displayed via some code path.) [jc: squashed the left-right change from Dscho and Adam's fixup into one] Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-24Documentation: convert tutorials to man pagesLibravatar Christian Couder7-24/+87
This patch renames the following documents and at the same time converts them to the man page format: cvs-migration.txt -> gitcvs-migration.txt tutorial.txt -> gittutorial.txt tutorial-2.txt -> gittutorial-2.txt These new man pages are put in section 7, and other documents that reference the above ones are change accordingly. [jc: with help from Nanako to clean things up] Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-24CodingGuidelines: Add a note to avoid assignments inside if()Libravatar Miklos Vajna1-0/+2
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-24diff-files: do not play --no-index gamesLibravatar Junio C Hamano1-4/+1
Being able to say "git diff A B" outside a git repository and getting a colourful version of "diff -u A B" may be nice, but such a cute hack should not give bogus results to scripts that want to give two paths, either or both of which happen to have been removed from the work tree, to "git diff-files". Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-23Merge branch 'pb/push'Libravatar Junio C Hamano1-6/+7
* pb/push: add special "matching refs" refspec
2008-05-23Merge branch 'bc/repack'Libravatar Junio C Hamano1-1/+13
* bc/repack: Documentation/git-repack.txt: document new -A behaviour let pack-objects do the writing of unreachable objects as loose objects add a force_object_loose() function builtin-gc.c: deprecate --prune, it now really has no effect git-gc: always use -A when manually repacking repack: modify behavior of -A option to leave unreferenced objects unpacked Conflicts: builtin-pack-objects.c
2008-05-23Merge branch 'maint'Libravatar Junio C Hamano3-5/+6
* maint: rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref Add missing "short" alternative to --date in rev-list-options.txt git-show.txt: Not very stubby these days. Clarify repack -n documentation
2008-05-23Add log.date config variableLibravatar Heikki Orsila2-1/+8
log.date config variable sets the default date-time mode for the log command. Setting log.date value is similar to using git log's --date option. Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-23git-hash-object: Add --stdin-paths optionLibravatar Adam Roben1-1/+4
This allows multiple paths to be specified on stdin. Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22Updated status to show 'Not currently on any branch' in redLibravatar Chris Parsons1-2/+4
This provides additional warning to users when attempting to commit to a detached HEAD. It is configurable in color.status.nobranch. Signed-off-by: Chris Parsons <chris@edendevelopment.co.uk> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22Add missing "short" alternative to --date in rev-list-options.txtLibravatar Heikki Orsila1-1/+1
Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22git-show.txt: Not very stubby these days.Libravatar Jon Loeliger1-2/+0
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22Clarify repack -n documentationLibravatar Shawn O. Pearce1-2/+5
While repacking a local repository a coworker thought the -n option was necessary to git-repack to keep it from updating some unknown file on the central server we all share. Explaining further what the option is (not) doing helps to make it clear the option does not impact any remote repositories the user may have configured. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21Documentation: Fix skipped section levelLibravatar Gustaf Hendeby1-1/+1
With xmlto 0.0.18 it seems to demand that no section levels are skipped. The commit 'implement gitcvs.usecrlfattr' (8a06a632976ead) one such skip, which here is removed by increasing the level of the offender. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
* maint: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/
2008-05-21Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano1-2/+2
* maint-1.5.4: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/
2008-05-21Merge branch 'ar/add-unreadable'Libravatar Junio C Hamano1-1/+6
* ar/add-unreadable: Add a config option to ignore errors for git-add Add a test for git-add --ignore-errors Add --ignore-errors to git-add to allow it to skip files with read errors Extend interface of add_files_to_cache to allow ignore indexing errors Make the exit code of add_file_to_index actually useful
2008-05-21Merge branch 'as/graph'Libravatar Junio C Hamano2-0/+189
* as/graph: graph API: eliminate unnecessary indentation log and rev-list: add --graph option Add history graph API revision API: split parent rewriting and parent printing options
2008-05-21cvsexportcommit: Create config option for CVS dirLibravatar Trent Piepho1-1/+7
For a given project the directory used with the -w option is almost always the same each time. Let it be specified with 'cvsexportcommit.cvsdir' so it's not necessary to manually add it with -w each time. Signed-off-by: Trent Piepho <tpiepho@freescale.com> Acked-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21Documentation: rev-parse: add a few "--verify" and "--default" examplesLibravatar Christian Couder1-0/+25
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-19doc/git-daemon: s/uploadarchive/uploadarch/Libravatar Jeff King1-2/+2
The git-daemon upload-archive feature has always used the config directive 'daemon.uploadarch'; the documentation which came later seems to have just mistakenly used the wrong name. Noticed by lionel@over-blog.com. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-19Documentation: Add missing git svn commandsLibravatar Gustaf Hendeby1-2/+15
Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16Merge branch 'maint'Libravatar Junio C Hamano1-0/+4
* maint: git-filter-branch: Clarify file removal example.
2008-05-16git-filter-branch: Clarify file removal example.Libravatar Jon Loeliger1-0/+4
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16submodule update: add convenience option --initLibravatar Johannes Schindelin1-1/+6
When a submodule is not initialized and you do not want to change the defaults from .gitmodules anyway, you can now say $ git submodule update --init <name> When "update" is called without --init on an uninitialized submodule, a hint to use --init is printed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16Documentation/git-repack.txt: document new -A behaviourLibravatar Chris Frey1-1/+13
Add paragraph for the -A option, and describe the new behaviour that makes unreachable objects loose. Signed-off-by: Chris Frey <cdfrey@foursquare.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16Documentation/git-web--browse.txt: fix small typoLibravatar Teemu Likonen1-1/+1
Change "brower.konqueror.path" to "browser.konqueror.path" in documentation. Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16git-cvsserver: add ability to guess -kb from contentsLibravatar Matthew Ogilvie2-9/+18
If "gitcvs.allbinary" is set to "guess", then any file that has not been explicitly marked as binary or text using the "crlf" attribute and the "gitcvs.usecrlfattr" config will guess binary based on the contents of the file. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16implement gitcvs.usecrlfattrLibravatar Matthew Ogilvie2-11/+38
If gitcvs.usecrlfattr is set to true, git-cvsserver will consult the "crlf" for each file to determine if it should mark the file as binary (-kb). Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-15cvsexportcommit: introduce -W for shared working trees (between Git and CVS)Libravatar Johannes Schindelin1-1/+6
If you have a CVS checkout, it is easy to import the CVS history by calling "git cvsimport". However, interacting with the CVS repository using "git cvsexportcommit" was cumbersome, since that script assumes separate working directories for Git and CVS. Now, you can call cvsexportcommit with the -W option. This will automatically discover the GIT_DIR, and it will check out the parent commit before exporting the commit. The intended workflow is this: $ CVSROOT=$URL cvs co module $ cd module $ git cvsimport hack, hack, hack, making two commits, cleaning them up using rebase -i. $ git cvsexportcommit -W -c -p -u HEAD^ $ git cvsexportcommit -W -c -p -u HEAD Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-15Teach update-index about --ignore-submodulesLibravatar Johannes Schindelin1-0/+5
Like with the diff machinery, update-index should sometimes just ignore submodules (e.g. to determine a clean state before a rebase). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-15diff options: Introduce --ignore-submodulesLibravatar Johannes Schindelin1-0/+3
The new option --ignore-submodules can now be used to ignore changes in submodules. Why? Sometimes it is not interesting when a submodule changed. For example, when reordering some commits in the superproject, a dirty submodule is usually totally uninteresting. So we will use this option in git-rebase to test for a dirty working tree. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-15Documentation/git-prune.txt: document unpacked logicLibravatar Chris Frey1-1/+4
Clarifies the git-prune man page, documenting that it only prunes unpacked objects. Signed-off-by: Chris Frey <cdfrey@foursquare.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-14Merge branch 'maint'Libravatar Junio C Hamano1-3/+4
* maint: Documentation/git-describe.txt: make description more readable
2008-05-14Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano1-3/+4
* maint-1.5.4: Documentation/git-describe.txt: make description more readable
2008-05-14Merge branch 'mv/format-cc'Libravatar Junio C Hamano1-0/+1
* mv/format-cc: Add tests for sendemail.cc configuration variable git-send-email: add a new sendemail.cc configuration variable git-format-patch: add a new format.cc configuration variable
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 04:26:10 +0000