summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-01-17Teach git-pull to pass -X<option> to git-mergeLibravatar Avery Pennarun2-2/+23
2010-01-17git merge -X<option>Libravatar Avery Pennarun11-26/+162
2010-01-17Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+38
2010-01-17Merge branch 'tc/test-locate-httpd'Libravatar Junio C Hamano1-6/+24
2010-01-17Merge branch 'jh/commit-status'Libravatar Junio C Hamano4-3/+134
2010-01-17Merge branch 'jn/makefile'Libravatar Junio C Hamano2-34/+26
2010-01-17Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Libravatar Junio C Hamano2-1/+58
2010-01-17Merge branch 'tc/clone-v-progress'Libravatar Junio C Hamano6-7/+20
2010-01-17Merge branch 'tc/smart-http-restrict'Libravatar Junio C Hamano7-260/+362
2010-01-17Merge branch 'jk/run-command-use-shell'Libravatar Junio C Hamano11-35/+69
2010-01-17Merge branch 'sr/gfi-options'Libravatar Junio C Hamano3-86/+462
2010-01-17Update COPYING with GPLv2 with new FSF addressLibravatar Junio C Hamano1-13/+12
2010-01-17user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereLibravatar Junio C Hamano3-2/+8
2010-01-17user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereLibravatar Junio C Hamano3-1/+11
2010-01-17rerere: honor conflict-marker-size attributeLibravatar Junio C Hamano3-2/+20
2010-01-17rerere: prepare for customizable conflict marker lengthLibravatar Junio C Hamano1-10/+44
2010-01-17commit.c::print_summary: do not release the format string too earlyLibravatar Junio C Hamano1-1/+1
2010-01-16conflict-marker-size: new attributeLibravatar Junio C Hamano1-25/+34
2010-01-16rerere: use ll_merge() instead of using xdl_merge()Libravatar Junio C Hamano1-4/+1
2010-01-16merge-tree: use ll_merge() not xdl_merge()Libravatar Junio C Hamano2-11/+9
2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tLibravatar Junio C Hamano2-8/+18
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersLibravatar Junio C Hamano6-12/+17
2010-01-16git_attr(): fix function signatureLibravatar Junio C Hamano9-14/+19
2010-01-16Do not use date.c:tm_to_time_t() from compat/mingw.cLibravatar Johannes Sixt1-17/+19
2010-01-16MSVC: Windows-native implementation for subset of Pthreads APILibravatar Andrzej K. Haczewski6-11/+217
2010-01-16Merge branch 'maint'Libravatar Junio C Hamano3-4/+6
2010-01-16Merge branch 'cc/reset-more'Libravatar Junio C Hamano1-10/+10
2010-01-16Documentation: Update git core tutorial clarifying reference to scriptsLibravatar Ramkumar Ramachandra1-0/+8
2010-01-16MSVC: Fix an "incompatible pointer types" compiler warningLibravatar Ramsay Jones2-25/+19
2010-01-16Windows: avoid the "dup dance" when spawning a child processLibravatar Johannes Sixt3-49/+50
2010-01-16Windows: simplify the pipe(2) implementationLibravatar Johannes Sixt1-29/+8
2010-01-16Windows: boost startup by avoiding a static dependency on shell32.dllLibravatar Johannes Sixt1-2/+14
2010-01-16Windows: disable PythonLibravatar Erik Faye-Lund1-0/+2
2010-01-16Add push --set-upstreamLibravatar Ilari Liusvaara5-1/+136
2010-01-16t7111: fix bad HEAD in tests with unmerged entriesLibravatar Christian Couder1-10/+10
2010-01-15difftool: Update copyright notices to list each year separatelyLibravatar David Aguilar2-2/+2
2010-01-15Fix uninitialized variable in get_refs_via_rsync().Libravatar Richard Weinberger1-1/+1
2010-01-15Test t5560: Fix test when run with dashLibravatar Tarmigan Casebolt1-5/+10
2010-01-15status: only touch path we may need to checkLibravatar Nguyễn Thái Ngọc Duy2-2/+2
2010-01-15difftool: Use eval to expand '--extcmd' expressionsLibravatar David Aguilar2-2/+14
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'Libravatar David Aguilar3-8/+24
2010-01-15t7800-difftool.sh: Simplify the --extcmd testLibravatar David Aguilar1-8/+5
2010-01-15grep --no-index: allow use of "git grep" outside a git repositoryLibravatar Junio C Hamano2-0/+78
2010-01-15grep: prepare to run outside of a work treeLibravatar Junio C Hamano2-1/+8
2010-01-14Document git-blame triple -C optionLibravatar Ramkumar Ramachandra2-3/+5
2010-01-14fast-import: tag may point to any object typeLibravatar Dmitry Potapov1-5/+5
2010-01-14commit: allow suppression of implicit identity adviceLibravatar Jeff King4-2/+11
2010-01-14commit: show interesting ident information in summaryLibravatar Jeff King2-4/+42
2010-01-14strbuf: add strbuf_addbuf_percentquoteLibravatar Jeff King3-0/+19
2010-01-14strbuf_expand: convert "%%" to "%"Libravatar Jeff King5-1/+18