summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/ll-merge-binary-ours' into maintJunio C Hamano2012-10-175-12/+41
|\
| * ll-merge: warn about inability to merge binary files only when we can'tJunio C Hamano2012-09-121-3/+4
| * attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-093-3/+3
| * merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-093-7/+35
* | Merge branch 'db/doc-custom-xmlto' into maintJunio C Hamano2012-10-171-2/+3
|\ \
| * | Documentation/Makefile: Allow custom XMLTO binaryDave Borowitz2012-09-201-2/+3
* | | Fix spelling error in post-receive-email hookRichard Fearn2012-10-141-1/+1
* | | gitweb.cgi: fix "comitter_tz" typo in feedDylan Alex Simon2012-10-121-1/+1
* | | attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy2012-10-101-0/+5
* | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-10-091-7/+7
|\ \ \
| * | | l10n: de.po: fix a few minor typosSimon Ruderich2012-10-041-7/+7
* | | | Git 1.7.12.3v1.7.12.3Junio C Hamano2012-10-083-2/+19
* | | | Merge branch 'os/commit-submodule-ignore' into maintJunio C Hamano2012-10-081-0/+1
|\ \ \ \
| * | | | commit: pay attention to submodule.$name.ignore in .gitmodulesOrgad Shaneh2012-09-241-0/+1
* | | | | Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maintJunio C Hamano2012-10-082-5/+32
|\ \ \ \ \
| * | | | | receive-pack: drop "n/a" on unpacker errorsJeff King2012-09-212-2/+2
| * | | | | receive-pack: send pack-processing stderr over sidebandJeff King2012-09-211-2/+24
| * | | | | receive-pack: redirect unpack-objects stdout to /dev/nullJeff King2012-09-211-1/+6
* | | | | | Merge branch 'rt/maint-clone-single' into maintJunio C Hamano2012-10-083-18/+218
|\ \ \ \ \ \
| * | | | | | clone --single: limit the fetch refspec to fetched branchRalf Thielow2012-09-203-18/+218
* | | | | | | Merge branch 'jc/blame-follows-renames' into maintJunio C Hamano2012-10-081-0/+6
|\ \ \ \ \ \ \
| * | | | | | | git blame: document that it always follows origin across whole-file renamesJunio C Hamano2012-09-211-0/+6
* | | | | | | | Merge branch 'lt/mailinfo-handle-attachment-more-sanely' into maintJunio C Hamano2012-10-081-11/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | mailinfo: don't require "text" mime type for attachmentsLinus Torvalds2012-10-011-11/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Start preparing for 1.7.12.3Junio C Hamano2012-10-022-1/+19
* | | | | | | Merge branch 'rr/maint-submodule-unknown-cmd' into maintJunio C Hamano2012-10-023-4/+11
|\ \ \ \ \ \ \
| * | | | | | | submodule: if $command was not matched, don't parse other argsRamkumar Ramachandra2012-09-253-4/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sp/maint-http-enable-gzip' into maintJunio C Hamano2012-10-023-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Enable info/refs gzip decompression in HTTP clientShawn O. Pearce2012-09-203-3/+5
* | | | | | | | Merge branch 'sp/maint-http-info-refs-no-retry' into maintJunio C Hamano2012-10-021-16/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "retry request without query when info/refs?query fails"Shawn O. Pearce2012-09-201-16/+2
| |/ / / / / / /
* | | | | | | | l10n: Fix to Swedish translationPeter Krefting2012-10-021-2/+2
* | | | | | | | Git 1.7.12.2v1.7.12.2Junio C Hamano2012-09-303-2/+11
* | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-09-302-28/+28
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN into maintJiang Xin2012-09-281-23/+23
| |\ \ \ \ \ \ \ \
| | * | | | | | | | l10n: Improve many translation for zh_CNThynson2012-08-071-17/+17
| | * | | | | | | | l10n: Unify the translation for '(un)expected'Thynson2012-08-071-7/+7
| * | | | | | | | | Merge branch 'maint' of https://github.com/ralfth/git-po-de into maintJiang Xin2012-09-281-5/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | l10n: de.po: correct translation of a 'rebase' messageRalf Thielow2012-09-271-5/+5
* | | | | | | | | | | Merge branch 'jc/maint-log-grep-all-match-1' into maintJunio C Hamano2012-09-306-25/+217
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | grep.c: make two symbols really file-scope static this timeJunio C Hamano2012-09-201-2/+2
| * | | | | | | | | | | t7810-grep: test --all-match with multiple --grep and --author optionsMichael J Gruber2012-09-161-0/+20
| * | | | | | | | | | | t7810-grep: test interaction of multiple --grep and --author optionsMichael J Gruber2012-09-161-16/+22
| * | | | | | | | | | | t7810-grep: test multiple --author with --all-matchMichael J Gruber2012-09-161-0/+8
| * | | | | | | | | | | t7810-grep: test multiple --grep with and without --all-matchMichael J Gruber2012-09-161-0/+16
| * | | | | | | | | | | t7810-grep: bring log --grep tests in common formMichael J Gruber2012-09-161-6/+18
| * | | | | | | | | | | grep.c: mark private file-scope symbols as staticJunio C Hamano2012-09-162-3/+6
| * | | | | | | | | | | log: document use of multiple commit limiting optionsJunio C Hamano2012-09-141-5/+18
| * | | | | | | | | | | log --grep/--author: honor --all-match honored for multiple --grep patternsJunio C Hamano2012-09-141-0/+19
| * | | | | | | | | | | grep: show --debug output only onceMichael J Gruber2012-09-141-0/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 08:43:21 +0100