summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | i18n: mark init-db messages for translationÆvar Arnfjörð Bjarmason2011-04-122-7/+10
| * | | | | | | | i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason2011-04-122-6/+27
| * | | | | | | | i18n: mark checkout --detach messages for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+3
| * | | | | | | | i18n: mark clone nonexistent repository message for translationÆvar Arnfjörð Bjarmason2011-04-121-1/+1
| * | | | | | | | i18n: mark merge CHERRY_PICK_HEAD messages for translationÆvar Arnfjörð Bjarmason2011-04-121-3/+3
| * | | | | | | | i18n: mark merge "upstream" messages for translationÆvar Arnfjörð Bjarmason2011-04-121-4/+4
| * | | | | | | | i18n: mark merge "Could not read from" message for translationÆvar Arnfjörð Bjarmason2011-04-121-1/+1
* | | | | | | | | Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-318-40/+152
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-227-10/+112
| * | | | | | | | | diffcore-rename: record filepair for rename srcJunio C Hamano2011-03-221-11/+12
| * | | | | | | | | diffcore-rename: refactor "too many candidates" logicJunio C Hamano2011-03-221-18/+29
| * | | | | | | | | builtin/diff.c: remove duplicated call to diff_result_code()Junio C Hamano2011-03-221-3/+1
* | | | | | | | | | Merge branch 'rr/doc-content-type' into maintJunio C Hamano2011-05-312-62/+103
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Documentation: Allow custom diff tools to be specified in 'diff.tool'Ramkumar Ramachandra2011-04-061-6/+8
| * | | | | | | | | Documentation: Add diff.<driver>.* to configRamkumar Ramachandra2011-04-061-0/+28
| * | | | | | | | | Documentation: Move diff.<driver>.* from config.txt to diff-config.txtRamkumar Ramachandra2011-04-062-62/+63
| * | | | | | | | | Documentation: Add filter.<driver>.* to configRamkumar Ramachandra2011-04-061-0/+10
* | | | | | | | | | Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano2011-05-304-5/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | read_gitfile_gently: use ssize_t to hold read resultJeff King2011-05-261-1/+1
| * | | | | | | | | | remove tests of always-false conditionJim Meyering2011-05-262-2/+2
| * | | | | | | | | | rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering2011-05-261-2/+8
* | | | | | | | | | | Merge branch 'bc/maint-submodule-fix-parked' into maintJunio C Hamano2011-05-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-submodule.sh: separate parens by a space to avoid confusing some shellsBrandon Casey2011-05-261-1/+1
* | | | | | | | | | | | Merge branch 'bc/maint-api-doc-parked' into maintJunio C Hamano2011-05-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/technical/api-diff.txt: correct name of diff_unmerge()Brandon Casey2011-05-261-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano2011-05-293-6/+34
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | run-command: handle short writes and EINTR in die_childJonathan Nieder2011-04-201-6/+9
| * | | | | | | | | | | tests: check error message from run_commandJonathan Nieder2011-04-202-0/+25
* | | | | | | | | | | | Git 1.7.5.3v1.7.5.3Junio C Hamano2011-05-264-3/+36
* | | | | | | | | | | | Merge branch 'maint-1.7.4' into maintJunio C Hamano2011-05-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-264-14/+67
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-261-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4Junio C Hamano2011-05-261-12/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2011-05-262-2/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | do not read beyond end of malloc'd bufferJim Meyering2011-05-202-2/+36
* | | | | | | | | | | | | | | | Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano2011-05-261-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT*Johannes Sixt2011-05-091-9/+9
| * | | | | | | | | | | | | | | Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...Junio C Hamano2011-05-091-10/+9
| * | | | | | | | | | | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdirKacper Kornet2011-04-281-9/+10
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'mg/diff-uiconfig-doc' into maintJunio C Hamano2011-05-262-12/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diffMichael J Gruber2011-04-272-12/+30
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ft/gitweb-tar-with-gzip-n' into maintJunio C Hamano2011-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gitweb: supply '-n' to gzip for identical outputFraser Tweedale2011-04-261-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ss/doc-svn' into maintJunio C Hamano2011-05-261-9/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | remove noise and inaccuracies from git-svn docsStefan Sperling2011-04-191-9/+7
* | | | | | | | | | | | | | | | Merge branch 'jn/format-patch-doc' into maintJunio C Hamano2011-05-264-195/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Documentation/format-patch: suggest Toggle Word Wrap add-on for ThunderbirdJohannes Sixt2011-04-191-4/+14
| * | | | | | | | | | | | | | | | Documentation: publicize hints for sending patches with GMailJonathan Nieder2011-04-154-55/+61
| * | | | | | | | | | | | | | | | Documentation: publicize KMail hints for sending patches inlineJonathan Nieder2011-04-152-20/+18
| * | | | | | | | | | | | | | | | Documentation: hints for sending patches inline with ThunderbirdJonathan Nieder2011-04-152-80/+84