summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | bash completion: add git-difftoolDavid Aguilar2009-04-071-5/+22
| * | | | | | | | | | | | | | | difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-075-6/+96
| * | | | | | | | | | | | | | | difftool: add various git-difftool testsDavid Aguilar2009-04-071-0/+147
| * | | | | | | | | | | | | | | difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-077-4/+27
| * | | | | | | | | | | | | | | difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping2009-04-076-11/+14
| * | | | | | | | | | | | | | | difftool: add a -y shortcut for --no-promptDavid Aguilar2009-04-072-25/+17
| * | | | | | | | | | | | | | | difftool: use perl built-ins when testing for msysDavid Aguilar2009-04-071-2/+5
| * | | | | | | | | | | | | | | difftool: remove the backup file featureDavid Aguilar2009-04-071-33/+1
| * | | | | | | | | | | | | | | difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiffDavid Aguilar2009-04-071-7/+3
| * | | | | | | | | | | | | | | git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg2009-04-073-5/+16
| * | | | | | | | | | | | | | | git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg2009-04-072-4/+16
| * | | | | | | | | | | | | | | doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg2009-04-071-1/+2
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-04-173-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | doc/gitattributes: clarify location of config textJeff King2009-04-171-3/+6
| * | | | | | | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-172-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-172-2/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Fix buffer overflow in config parserThomas Jarosch2009-04-172-2/+9
| * | | | | | | | | | | | | | | git-apply: fix option descriptionUlrich Windl2009-04-161-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | hook/update: example of how to prevent branch creationPierre Habouzit2009-04-171-1/+10
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
View Lorry Controller Status