summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/archive-attribute'Junio C Hamano2009-04-181-1/+4
|\
| * archive: do not read .gitattributes in working directoryNguyễn Thái Ngọc Duy2009-04-171-1/+4
* | Merge branch 'maint'Junio C Hamano2009-04-183-10/+41
|\ \
| * | Describe fixes since 1.6.2.3Junio C Hamano2009-04-181-0/+31
| * | doc/git-daemon: add missing arguments to max-connections optionMarkus Heidelberg2009-04-181-1/+1
| * | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-04-181-8/+8
| |\ \
| | * | doc/git-daemon: add missing arguments to optionsMarkus Heidelberg2009-04-181-8/+8
| * | | imap-send: use correct configuration variable in documentationPaul Bolle2009-04-181-1/+1
* | | | Merge branch 'jk/cobdoc'Junio C Hamano2009-04-172-47/+45
|\ \ \ \
| * | | | docs/checkout: clarify what "non-branch" meansJeff King2009-04-131-5/+5
| * | | | doc/checkout: split checkout and branch creation in synopsisJeff King2009-04-131-18/+22
| * | | | doc/checkout: refer to git-branch(1) as appropriateJeff King2009-04-131-19/+9
| * | | | doc: refer to tracking configuration as "upstream"Jeff King2009-04-132-12/+14
| * | | | doc: clarify --no-track optionJeff King2009-04-132-2/+4
| | |_|/ | |/| |
* | | | Merge branch 'mm/add-p-quit'Junio C Hamano2009-04-171-0/+3
|\ \ \ \
| * | | | Update git-add.txt according to the new possibilities of 'git add -p'.Matthieu Moy2009-04-161-1/+3
| * | | | git add -p: new "quit" command at the prompt.Matthieu Moy2009-04-151-0/+1
| |/ / /
* | | | Merge branch 'eb/upload-archive-from-git-shell'Junio C Hamano2009-04-171-3/+3
|\ \ \ \
| * | | | git-shell: Add 'git-upload-archive' to allowed commands.Erik Broes2009-04-111-3/+3
* | | | | Merge branch 'bw/short-ref-strict'Junio C Hamano2009-04-172-0/+7
|\ \ \ \ \
| * | | | | rev-parse: --abbrev-ref option to shorten ref nameBert Wesarg2009-04-131-0/+5
| * | | | | for-each-ref: utilize core.warnAmbiguousRefs for :short-formatBert Wesarg2009-04-131-0/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'da/difftool'Junio C Hamano2009-04-175-2/+184
|\ \ \ \ \
| * | | | | mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-121-9/+7
| * | | | | difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-081-0/+56
| * | | | | difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-072-1/+12
| * | | | | difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-072-0/+115
| * | | | | difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping2009-04-072-2/+2
| * | | | | git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg2009-04-072-2/+3
| * | | | | doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg2009-04-071-1/+2
* | | | | | Merge branch 'maint'Junio C Hamano2009-04-171-3/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | doc/gitattributes: clarify location of config textJeff King2009-04-171-3/+6
* | | | | GIT 1.6.3-rc0v1.6.3-rc0Junio C Hamano2009-04-122-3/+14
* | | | | Documentation/git.txt: GIT 1.6.2.2 has been out for a whileNanako Shiraishi2009-04-121-1/+2
* | | | | Merge branch 'sb/doc-upstream-branch'Junio C Hamano2009-04-122-1/+7
|\ \ \ \ \
| * | | | | Documentation: Introduce "upstream branch"Santi Béjar2009-04-072-1/+7
* | | | | | Merge branch 'jk/show-upstream'Junio C Hamano2009-04-122-1/+8
|\ \ \ \ \ \
| * | | | | | branch: show upstream branch when double verboseJeff King2009-04-071-1/+3
| * | | | | | for-each-ref: add "upstream" format fieldJeff King2009-04-071-0/+5
* | | | | | | Merge branch 'fg/remote-prune'Junio C Hamano2009-04-121-1/+3
|\ \ \ \ \ \ \
| * | | | | | | git remote update: Fallback to remote if group does not existFinn Arne Gangstad2009-04-071-1/+1
| * | | | | | | git remote update: New option --pruneFinn Arne Gangstad2009-04-051-1/+3
* | | | | | | | Merge branch 'maint'Junio C Hamano2009-04-122-6/+3
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | GIT 1.6.2.3v1.6.2.3Junio C Hamano2009-04-121-6/+0
| * | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-121-0/+3
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-121-0/+3
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | State the effect of filter-branch on graft explicitlyDaniel Cheng (aka SDiZ)2009-04-121-0/+3
| | * | | | | | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Junio C Hamano2009-04-081-9/+12
| | |\ \ \ \ \ \ \
* | | | | | | | | | documentation: Makefile accounts for SHELL_PATH settingBen Walton2009-04-121-6/+10
* | | | | | | | | | git-svn: Save init/clone --ignore-paths in configBen Jackson2009-04-111-0/+4