summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint' into tj/imap-send-remove-unusedtj/maint-imap-send-remove-unusedJunio C Hamano2011-11-232374-58531/+446169
|\
| * documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein2011-11-211-1/+1
| * Git 1.7.7.4v1.7.7.4Junio C Hamano2011-11-183-2/+16
| * Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano2011-11-181-1/+1
| |\
| | * name-rev --all: do not even attempt to describe non-commit objectjc/maint-name-rev-allJunio C Hamano2011-11-151-1/+1
| * | Merge branch 'ml/mailmap' into maintJunio C Hamano2011-11-181-3/+2
| |\ \
| | * | mailmap: xcalloc mailmap_infoml/mailmapMarc-André Lureau2011-11-161-3/+2
| * | | Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano2011-11-181-43/+61
| |\ \ \
| | * | | notes merge: eliminate OUTPUT macrojn/maint-notes-avoid-va-argsJonathan Nieder2011-11-171-43/+61
| * | | | Makefile: add missing header file dependenciesJonathan Nieder2011-11-181-2/+3
| * | | | Git 1.7.7.3v1.7.7.3Junio C Hamano2011-11-083-2/+21
| * | | | Merge branch 'jc/maint-remove-renamed-ref' into maintJunio C Hamano2011-11-081-8/+0
| |\ \ \ \
| | * | | | branch -m/-M: remove undocumented RENAMED-REFJunio C Hamano2011-10-121-8/+0
| * | | | | Merge branch 'jm/maint-gitweb-filter-forks-fix' into maintJunio C Hamano2011-11-081-1/+1
| |\ \ \ \ \
| | * | | | | gitweb: fix regression when filtering out forksJulien Muchembled2011-10-211-1/+1
| * | | | | | Merge branch 'dm/pack-objects-update' into maintJunio C Hamano2011-11-081-19/+55
| |\ \ \ \ \ \
| | * | | | | | pack-objects: don't traverse objects unnecessarilyDan McGee2011-10-201-6/+12
| | * | | | | | pack-objects: rewrite add_descendants_to_write_order() iterativelyDan McGee2011-10-181-7/+37
| | * | | | | | pack-objects: use unsigned int for counter and offset valuesDan McGee2011-10-181-6/+6
| | * | | | | | pack-objects: mark add_to_write_order() as inlineDan McGee2011-10-181-1/+1
| * | | | | | | docs: Update install-doc-quickJunio C Hamano2011-11-083-50/+46
| * | | | | | | docs: don't mention --quiet or --exit-code in git-log(1)Jeff King2011-11-081-0/+2
| * | | | | | | Git 1.7.7.2v1.7.7.2Junio C Hamano2011-11-012-1/+45
| * | | | | | | Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-11-011-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | t7511: avoid use of reserved filename on Windows.Pat Thoyts2011-10-311-1/+1
| * | | | | | | | Merge branch 'md/smtp-tls-hello-again' into maintJunio C Hamano2011-11-011-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | send-email: Honour SMTP domain when using TLSMatthew Daley2011-10-151-1/+1
| * | | | | | | | | Merge branch 'jk/pull-rebase-with-work-tree' into maintJunio C Hamano2011-11-012-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-132-2/+2
| * | | | | | | | | | Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano2011-11-011-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | diff: teach --stat/--numstat to honor -U$numJunio C Hamano2011-09-221-0/+2
| * | | | | | | | | | | Merge branch 'js/bisect-no-checkout' into maintJunio C Hamano2011-11-011-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | bisect: fix exiting when checkout failed in bisect_start()Christian Couder2011-09-211-1/+2
| * | | | | | | | | | | | Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-0111-36/+92
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2011-10-112-3/+61
| | * | | | | | | | | | | | attr: read core.attributesfile from git_default_core_configJunio C Hamano2011-10-065-13/+9
| | * | | | | | | | | | | | builtin/mv.c: plug miniscule memory leakBrandon Casey2011-10-061-1/+5
| | * | | | | | | | | | | | cleanup: use internal memory allocation wrapper functions everywhereBrandon Casey2011-10-067-8/+8
| | * | | | | | | | | | | | attr.c: avoid inappropriate access to strbuf "buf" memberBrandon Casey2011-10-061-13/+11
| * | | | | | | | | | | | | Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-015-55/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruningCarlos Martín Nieto2011-10-152-4/+23
| | * | | | | | | | | | | | | fetch: honor the user-provided refspecs when pruning refsCarlos Martín Nieto2011-10-155-20/+36
| | * | | | | | | | | | | | | remote: separate out the remote_find_tracking logic into query_refspecsCarlos Martín Nieto2011-10-151-36/+33
| | * | | | | | | | | | | | | t5510: add tests for fetch --pruneCarlos Martín Nieto2011-10-071-0/+50
| | * | | | | | | | | | | | | fetch: free all the additional refspecsCarlos Martín Nieto2011-10-071-1/+1
| | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'sp/smart-http-failure' into maintJunio C Hamano2011-11-011-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | remote-curl: Fix warning after HTTP failureShawn O. Pearce2011-10-041-1/+8
| * | | | | | | | | | | | | | Merge jn/maint-http-error-messageJunio C Hamano2011-11-011-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | http: avoid empty error messages for some curl errorsJonathan Nieder2011-09-061-1/+6
| | * | | | | | | | | | | | | | http: remove extra newline in error messageJonathan Nieder2011-09-061-1/+1