summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/i18n-basic'Junio C Hamano2011-03-196-0/+93
|\
| * i18n: "make distclean" should clean up after "make pot"Jonathan Nieder2011-03-091-0/+1
| * i18n: Makefile: "pot" target to extract messages marked for translationÆvar Arnfjörð Bjarmason2011-03-092-0/+17
| * i18n: add stub Q_() wrapper for ngettextJonathan Nieder2011-03-091-2/+10
| * i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is setJonathan Nieder2011-03-084-3/+26
| * i18n: add GETTEXT_POISON to simulate unfriendly translatorÆvar Arnfjörð Bjarmason2011-03-083-1/+17
| * i18n: add no-op _() and N_() wrappersÆvar Arnfjörð Bjarmason2011-03-083-0/+28
| * commit, status: use status_printf{,_ln,_more} helpersJonathan Nieder2011-03-082-66/+67
| * commit: refer to commit template as s->fpJonathan Nieder2011-03-081-14/+13
| * wt-status: add helpers for printing wt-status linesJonathan Nieder2011-03-084-0/+93
* | Merge branch 'uk/ls-remote-in-get-remote-url'Junio C Hamano2011-03-193-52/+12
|\ \
| * | git-request-pull: open-code the only invocation of get_remote_urlUwe Kleine-König2011-03-022-6/+1
| * | get_remote_url(): use the same data source as ls-remote to get remote urlsUwe Kleine-König2011-03-022-47/+12
* | | Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-195-113/+130
|\ \ \
| * | | mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-285-6/+24
| * | | mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-284-118/+117
* | | | Merge branch 'jn/status-translatable'Junio C Hamano2011-03-195-72/+166
|\ \ \ \
| * | | | commit, status: use status_printf{,_ln,_more} helpersJonathan Nieder2011-03-082-66/+67
| * | | | commit: refer to commit template as s->fpJonathan Nieder2011-03-081-14/+13
| * | | | wt-status: add helpers for printing wt-status linesJonathan Nieder2011-03-084-0/+93
| | |_|/ | |/| |
* | | | Merge branch 'jk/trace-sifter'Junio C Hamano2011-03-1910-24/+121
|\ \ \ \
| * | | | trace: give repo_setup trace its own keyJeff King2011-03-082-6/+7
| * | | | add packet tracing debug codeJeff King2011-03-088-1/+65
| * | | | trace: add trace_strbufJeff King2011-03-082-7/+17
| * | | | trace: factor out "do we want to trace" logicJeff King2011-03-082-3/+12
| * | | | trace: refactor to support multiple env variablesJeff King2011-03-082-11/+19
| * | | | trace: add trace_vprintfJeff King2011-03-082-5/+10
| |/ / /
* | | | Merge branch 'jk/format-patch-multiline-header'Junio C Hamano2011-03-194-10/+121
|\ \ \ \
| * | | | format-patch: rfc2047-encode newlines in headersJeff King2011-02-231-2/+2
| * | | | format-patch: wrap long header linesJeff King2011-02-232-8/+108
| * | | | strbuf: add fixed-length version of add_wrapped_textJeff King2011-02-232-0/+11
| | |_|/ | |/| |
* | | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-199-10/+49
|\ \ \ \
| * | | | pull: propagate --progress to mergeJeff King2011-02-211-2/+4
| * | | | merge: enable progress reporting for rename detectionJeff King2011-02-214-1/+18
| * | | | add inexact rename detection progress infrastructureJeff King2011-02-212-0/+11
| * | | | commit: stop setting rename limitJeff King2011-02-211-1/+0
| * | | | bump rename limit defaults (again)Jeff King2011-02-212-2/+2
| * | | | merge: improve inexact rename limit warningJeff King2011-02-214-4/+14
| |/ / /
* | | | Merge branch 'maint'Junio C Hamano2011-03-192-4/+8
|\ \ \ \
| * | | | gitweb: Always call parse_date with timezone parameterJakub Narebski2011-03-191-3/+2
| * | | | bisect: explain the rationale behind 125Junio C Hamano2011-03-191-1/+6
* | | | | grep: read patterns from stdin with -f -René Scharfe2011-03-192-2/+9
* | | | | Merge branch 'maint'Junio C Hamano2011-03-181-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | docs: fix grammar in gitattributes.txtAlexei Sholik2011-03-181-5/+5
* | | | | Name make_*_path functions more accuratelyCarlos Martín Nieto2011-03-1714-38/+52
* | | | | RelNotes/1.7.5.txt: typo and language fixesMichael J Gruber2011-03-161-22/+9
* | | | | Merge branch 'maint'Junio C Hamano2011-03-1627-178/+215
|\ \ \ \ \ | |/ / / /
| * | | | Prepare draft release notes to 1.7.4.2Junio C Hamano2011-03-162-1/+43
| * | | | Merge branch 'jn/maint-commit-missing-template' into maintJunio C Hamano2011-03-162-4/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'lt/rename-no-extra-copy-detection' into maintJunio C Hamano2011-03-169-45/+46
| |\ \ \ \ \