summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/tutorial-test'Junio C Hamano2009-11-171-10/+10
|\
| * t1200: Make documentation and test agreeStephen Boyd2009-11-061-10/+10
* | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-11-171-0/+17
|\ \
| * | Document git-svn's first-parent ruleThomas Rast2009-11-161-0/+10
| * | git svn: attempt to create empty dirs on clone+rebaseEric Wong2009-11-151-0/+7
* | | Update draft release notes to 1.6.6Junio C Hamano2009-11-161-27/+27
* | | Sync with 1.6.5.3Junio C Hamano2009-11-162-1/+65
|\ \ \
| * | | Git 1.6.5.3v1.6.5.3Junio C Hamano2009-11-162-1/+65
| * | | Merge branch 'jk/maint-1.6.3-ls-files-i' into maintJunio C Hamano2009-11-151-2/+4
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-151-1/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'tr/maint-roff-quote' into maintJunio C Hamano2009-11-152-0/+24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ja/fetch-doc' into maintJunio C Hamano2009-11-153-67/+76
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cb/doc-fetch-pull-merge' into maintJunio C Hamano2009-11-153-45/+66
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/receive-pack-auto' into maintJunio C Hamano2009-11-151-0/+9
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'fc/doc-fast-forward'Junio C Hamano2009-11-1515-34/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use 'fast-forward' all over the placeFelipe Contreras2009-10-2415-34/+34
* | | | | | | | | | | Merge branch 'sc/difftool-p4merge'Junio C Hamano2009-11-153-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-283-3/+3
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-11-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | git-add.txt: fix formatting of --patch sectionStephen Boyd2009-11-141-4/+4
* | | | | | | | | | | git-describe.txt: formatting fixJunio C Hamano2009-11-101-0/+1
* | | | | | | | | | | Merge branch 'jk/maint-1.6.3-ls-files-i'Junio C Hamano2009-11-101-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | ls-files: unbreak "ls-files -i"Jeff King2009-10-301-2/+4
* | | | | | | | | | | Merge branch 'bg/merge-ff-only'Junio C Hamano2009-11-101-0/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-301-0/+5
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jp/dirty-describe'Junio C Hamano2009-11-101-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Teach "git describe" --dirty optionJean Privat2009-10-271-0/+6
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | git-update-index.txt: Document the --really-refresh option.Štěpán Němec2009-11-101-1/+5
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-11-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix documentation grammar typoGisle Aas2009-11-041-1/+1
| * | | | | | | | | Merge branch 'bg/clone-doc' into maintJunio C Hamano2009-11-011-13/+13
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ fixup tr/stash-format mergeJunio C Hamano2009-10-302-2/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stash list: drop the default limit of 10 stashesThomas Rast2009-10-191-2/+1
| * | | | | | | | | | | Introduce new pretty formats %g[sdD] for reflog informationThomas Rast2009-10-191-0/+9
* | | | | | | | | | | | Merge branch 'js/diff-verbose-submodule'Junio C Hamano2009-10-301-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add the --submodule option to the diff option familyJohannes Schindelin2009-10-191-0/+7
* | | | | | | | | | | | | Merge branch 'jn/show-normalized-refs'Junio C Hamano2009-10-301-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git check-ref-format --printJunio C Hamano2009-10-121-6/+19
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ak/bisect-reset-to-switch'Junio C Hamano2009-10-301-6/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | bisect reset: Allow resetting to any commit, not just a branchAnders Kaseorg2009-10-131-6/+17
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'tr/maint-roff-quote'Junio C Hamano2009-10-302-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Quote ' as \(aq in manpagesThomas Rast2009-10-222-0/+24
* | | | | | | | | | | | | Merge branch 'ja/fetch-doc'Junio C Hamano2009-10-303-67/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Documentation/merge-options.txt: order options in alphabetical groupsJari Aalto2009-10-221-43/+45
| * | | | | | | | | | | | Documentation/git-pull.txt: Add subtitles above included option filesJari Aalto2009-10-221-0/+7
| * | | | | | | | | | | | Documentation/fetch-options.txt: order options alphabeticallyJari Aalto2009-10-211-24/+24
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'cb/doc-fetch-pull-merge'Junio C Hamano2009-10-303-45/+66
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | modernize fetch/merge/pull examplesClemens Buchacher2009-10-213-45/+66
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-10-301-4/+13
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | / / / / | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | More precise description of 'git describe --abbrev'Gisle Aas2009-10-301-4/+13