summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff-highlight: document some non-optimal casesjk/diff-highlightJeff King2012-02-131-0/+93
* diff-highlight: match multi-line hunksJeff King2012-02-132-34/+52
* diff-highlight: refactor to prepare for multi-line hunksJeff King2012-02-131-8/+14
* diff-highlight: don't highlight whole linesJeff King2012-02-131-2/+26
* diff-highlight: make perl strict and warnings fatalJeff King2012-02-131-0/+3
* Sync with maintJunio C Hamano2012-02-1312-169/+32
|\
| * Update draft release notes to 1.7.9.1Junio C Hamano2012-02-131-3/+19
| * Merge branch 'js/add-e-submodule-fix' into maintJunio C Hamano2012-02-131-0/+1
| |\
| * \ Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-134-1/+60
| |\ \
| * \ \ Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-132-1/+15
| |\ \ \
| * \ \ \ Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-133-4/+61
| |\ \ \ \
| * \ \ \ \ Merge branch 'jn/rpm-spec' into maintJunio C Hamano2012-02-131-0/+1
| |\ \ \ \ \
| * | | | | | t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-136-10/+10
| * | | | | | Remove Git's support for smoke testingÆvar Arnfjörð Bjarmason2012-02-133-133/+1
| * | | | | | Makefile: Change the default compiler from "gcc" to "cc"Ævar Arnfjörð Bjarmason2012-02-131-1/+1
* | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-121-1/+40
* | | | | | | Merge branch 'jc/checkout-out-of-unborn'Junio C Hamano2012-02-122-1/+29
|\ \ \ \ \ \ \
| * | | | | | | git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unbornJunio C Hamano2012-02-062-1/+29
* | | | | | | | Merge branch 'jc/maint-mailmap-output'Junio C Hamano2012-02-121-8/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | mailmap: always return a plain mail address from map_user()jc/maint-mailmap-outputJunio C Hamano2012-02-061-8/+10
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/prompt-fallback-to-tty'Junio C Hamano2012-02-121-9/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | prompt: fall back to terminal if askpass failsjk/prompt-fallback-to-ttyJeff King2012-02-031-7/+17
| * | | | | | | | prompt: clean up strbuf usageJeff King2012-02-031-2/+1
* | | | | | | | | Merge branch 'jn/gitweb-search-utf-8'Junio C Hamano2012-02-121-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: Allow UTF-8 encoded CGI query parameters and path_infojn/gitweb-search-utf-8Jakub Narebski2012-02-031-8/+8
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/diffstat-gramnum'Junio C Hamano2012-02-1269-118/+168
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-0369-118/+168
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/find-pack-entry-recent-cache-invalidation'Junio C Hamano2012-02-121-38/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | find_pack_entry(): do not keep packed_git pointer locallynd/find-pack-entry-recent-cache-invalidationNguyễn Thái Ngọc Duy2012-02-011-14/+13
| * | | | | | | | | sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()Nguyễn Thái Ngọc Duy2012-02-011-26/+35
| |/ / / / / / / /
* | | | | | | | | Merge branch 'tt/profile-build-fix'Junio C Hamano2012-02-122-22/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: fix syntax for older makett/profile-build-fixJohannes Sixt2012-02-091-2/+4
| * | | | | | | | | Fix build problems related to profile-directed optimizationTheodore Ts'o2012-02-062-22/+48
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/cache-tree-api-refactor'Junio C Hamano2012-02-125-20/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cache-tree: update API to take abitrary flagsnd/cache-tree-api-refactorNguyễn Thái Ngọc Duy2012-02-075-20/+19
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fc/zsh-completion'Junio C Hamano2012-02-121-56/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: simplify __gitcomp and __gitcomp_nl implementationsfc/zsh-completionFelipe Contreras2012-02-061-16/+3
| * | | | | | | | | completion: use ls -1 instead of rolling a loop to do that ourselvesFelipe Contreras2012-02-061-37/+2
| * | | | | | | | | completion: work around zsh option propagation bugFelipe Contreras2012-02-061-3/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mp/make-cleanse-x-for-exe'Junio C Hamano2012-02-121-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Explicitly set X to avoid potential build breakagemp/make-cleanse-x-for-exeMichael Palimaka2012-02-091-0/+3
* | | | | | | | | | Merge branch 'bw/inet-pton-ntop-compat'Junio C Hamano2012-02-122-12/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Drop system includes from inet_pton/inet_ntop compatibility wrappersbw/inet-pton-ntop-compatBen Walton2012-02-052-12/+0
* | | | | | | | | | | Merge branch 'jc/maint-commit-ignore-i-t-a'Junio C Hamano2012-02-122-6/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: ignore intent-to-add entries instead of refusingjc/maint-commit-ignore-i-t-aJunio C Hamano2012-02-072-6/+8
* | | | | | | | | | | | Merge branch 'jk/maint-tag-show-fixes'Junio C Hamano2012-02-122-32/+53
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixesJunio C Hamano2012-02-082-10/+25
| * | | | | | | | | | | | tag: die when listing missing or corrupt objectsJeff King2012-02-061-1/+5
| * | | | | | | | | | | | tag: fix output of "tag -n" when errors occurJeff King2012-02-061-32/+34
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'mm/empty-loose-error-message'Junio C Hamano2012-02-121-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \