summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/archive-attribute'Junio C Hamano2009-04-189-12/+147
|\
| * archive test: attributesRené Scharfe2009-04-171-0/+91
| * archive: do not read .gitattributes in working directoryNguyễn Thái Ngọc Duy2009-04-174-2/+36
| * unpack-trees: do not muck with attributes when we are not checking outJunio C Hamano2009-04-171-2/+4
| * attr: add GIT_ATTR_INDEX "direction"Nguyễn Thái Ngọc Duy2009-04-172-4/+11
| * archive tests: do not use .gitattributes in working directoryRené Scharfe2009-04-171-4/+5
* | Merge branch 'maint'Junio C Hamano2009-04-185-11/+53
|\ \
| * | Describe fixes since 1.6.2.3Junio C Hamano2009-04-182-1/+32
| * | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-180-0/+0
| |\ \
| | * \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-183-9/+20
| | |\ \
| * | \ \ Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maintJunio C Hamano2009-04-184-5/+29
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/maint-submodule-checkout' into maintJunio C Hamano2009-04-182-3/+42
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cb/maint-merge-recursive-submodule-fix' into maintJunio C Hamano2009-04-182-12/+78
| |\ \ \ \ \ \
| * | | | | | | 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-183-9/+20
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | doc/git-daemon: add missing arguments to optionsMarkus Heidelberg2009-04-181-8/+8
| | * | | | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variableFrank Lichtenheld2009-04-182-1/+12
| * | | | | | | imap-send: use correct configuration variable in documentationPaul Bolle2009-04-181-1/+1
* | | | | | | | Merge branch 'ac/color-graph'Junio C Hamano2009-04-172-48/+199
|\ \ \ \ \ \ \ \
| * | | | | | | | graph API: Added logic for colored edgesAllan Caffee2009-04-132-48/+199
* | | | | | | | | 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 'mk/apply-swap'Junio C Hamano2009-04-172-7/+84
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-152-8/+47
| * | | | | | | | | tests: test applying criss-cross rename patchMichał Kiedrowicz2009-04-131-0/+38
* | | | | | | | | | Merge branch 'mm/add-p-quit'Junio C Hamano2009-04-172-39/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update git-add.txt according to the new possibilities of 'git add -p'.Matthieu Moy2009-04-161-1/+3
| * | | | | | | | | | add-interactive: refactor mode hunk handlingJeff King2009-04-161-43/+21
| * | | | | | | | | | git add -p: new "quit" command at the prompt.Matthieu Moy2009-04-152-1/+20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'eb/upload-archive-from-git-shell'Junio C Hamano2009-04-172-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-shell: Add 'git-upload-archive' to allowed commands.Erik Broes2009-04-112-3/+4
* | | | | | | | | | | Merge branch 'jc/shared-literally'Junio C Hamano2009-04-171-5/+9
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Mark t1301 permission test to depend on POSIXPERMJunio C Hamano2009-04-12346-4349/+10224
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | t1301-shared-repo: fix forced modes testJohannes Sixt2009-04-121-4/+8
* | | | | | | | | | | | Merge branch 'ns/am-to-empty'Junio C Hamano2009-04-172-5/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-am: teach git-am to apply a patch to an unborn branchNanako Shiraishi2009-04-122-5/+39
* | | | | | | | | | | | | Merge branch 'bw/short-ref-strict'Junio C Hamano2009-04-179-17/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | remote.c: use shorten_unambiguous_refMichael J Gruber2009-04-171-5/+1
| * | | | | | | | | | | | | rev-parse: --abbrev-ref option to shorten ref nameBert Wesarg2009-04-132-2/+26
| * | | | | | | | | | | | | for-each-ref: utilize core.warnAmbiguousRefs for :short-formatBert Wesarg2009-04-133-4/+22
| * | | | | | | | | | | | | shorten_unambiguous_ref(): add strict modeBert Wesarg2009-04-134-7/+19
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2009-04-1715-486/+825
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-124-70/+76
| * | | | | | | | | | | | | Fix misspelled mergetool.keepBackupFerry Huberts2009-04-111-1/+1
| * | | | | | | | | | | | | difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-086-388/+458
| * | | | | | | | | | | | | mergetool: use $( ... ) instead of `backticks`David Aguilar2009-04-071-8/+8