| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jk/format-patch-multiline-header' | Junio C Hamano | 2011-05-04 | 1 | -0/+15 |
|\ |
|
| * | format-patch: wrap email addresses after long names | Jeff King | 2011-04-14 | 1 | -0/+15 |
* | | Merge branch 'jm/mergetool-submodules' | Junio C Hamano | 2011-05-04 | 1 | -3/+287 |
|\ \ |
|
| * | | mergetool: Teach about submodules | Jonathon Mah | 2011-04-13 | 1 | -3/+287 |
* | | | Merge branch 'jk/notes-ui-updates' | Junio C Hamano | 2011-05-02 | 1 | -0/+38 |
|\ \ \ |
|
| * | | | revision.c: make --no-notes reset --notes list | Jeff King | 2011-03-29 | 1 | -0/+16 |
| * | | | revision.c: support --notes command-line option | Jeff King | 2011-03-29 | 1 | -0/+22 |
* | | | | Merge branch 'ab/i18n-fixup' | Junio C Hamano | 2011-05-02 | 36 | -363/+343 |
|\ \ \ \ |
|
| * | | | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 | Junio C Hamano | 2011-04-14 | 4 | -19/+10 |
| * | | | | i18n: use test_i18n{grep,cmp} in t7508 | Junio C Hamano | 2011-04-14 | 1 | -120/+102 |
| * | | | | i18n: use test_i18ngrep in t7506 | Junio C Hamano | 2011-04-14 | 1 | -28/+28 |
| * | | | | i18n: use test_i18ngrep and test_i18ncmp in t7502 | Junio C Hamano | 2011-04-13 | 1 | -41/+31 |
| * | | | | i18n: use test_i18ngrep in t7501 | Junio C Hamano | 2011-04-13 | 1 | -3/+4 |
| * | | | | i18n: use test_i18ncmp in t7500 | Junio C Hamano | 2011-04-13 | 1 | -5/+5 |
| * | | | | i18n: use test_i18ngrep in t7201 | Junio C Hamano | 2011-04-13 | 1 | -7/+7 |
| * | | | | i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 | Junio C Hamano | 2011-04-13 | 2 | -8/+8 |
| * | | | | i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012... | Junio C Hamano | 2011-04-13 | 6 | -17/+15 |
| * | | | | i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 | Junio C Hamano | 2011-04-13 | 3 | -13/+13 |
| * | | | | i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 | Junio C Hamano | 2011-04-13 | 3 | -6/+6 |
| * | | | | i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 | Junio C Hamano | 2011-04-13 | 4 | -19/+21 |
| * | | | | i18n: use test_i18ngrep in lib-httpd and t2019 | Junio C Hamano | 2011-04-13 | 2 | -9/+8 |
| * | | | | i18n: do not overuse C_LOCALE_OUTPUT (grep) | Junio C Hamano | 2011-04-13 | 2 | -5/+23 |
| * | | | | i18n: use test_i18ncmp in t1200 and t2200 | Junio C Hamano | 2011-04-13 | 2 | -4/+4 |
| * | | | | i18n: .git file is not a human readable message (t5601) | Junio C Hamano | 2011-04-13 | 1 | -1/+1 |
| * | | | | i18n: do not overuse C_LOCALE_OUTPUT | Junio C Hamano | 2011-04-12 | 2 | -57/+44 |
| * | | | | i18n: mark init-db messages for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -2/+5 |
| * | | | | i18n: mark checkout plural warning for translation | Ævar Arnfjörð Bjarmason | 2011-04-12 | 1 | -3/+12 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'nm/submodule-update-force' | Junio C Hamano | 2011-05-02 | 1 | -0/+23 |
|\ \ \ \ |
|
| * | | | | submodule: Add --force option for git submodule update | Nicolas Morey-Chaisemartin | 2011-04-04 | 1 | -0/+23 |
* | | | | | Merge branch 'jh/notes-add-ui' | Junio C Hamano | 2011-05-02 | 1 | -2/+27 |
|\ \ \ \ \ |
|
| * | | | | | Make "git notes add" more user-friendly when there are existing notes | Johan Herland | 2011-03-30 | 1 | -2/+27 |
* | | | | | | Merge branch 'mz/maint-rename-unmerged' | Junio C Hamano | 2011-05-02 | 1 | -0/+62 |
|\ \ \ \ \ \ |
|
| * | | | | | | diffcore-rename: don't consider unmerged path as source | Martin von Zweigbergk | 2011-03-23 | 1 | -0/+62 |
* | | | | | | | t/test-lib.sh: minor readability improvements | Mathias Lafeldt | 2011-04-29 | 1 | -7/+9 |
* | | | | | | | Merge branch 'jc/diff-irreversible-delete' | Junio C Hamano | 2011-04-28 | 1 | -1/+42 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | git diff -D: omit the preimage of deletes | Junio C Hamano | 2011-04-02 | 1 | -1/+42 |
* | | | | | | | | Merge branch 'jc/rename-degrade-cc-to-c' | Junio C Hamano | 2011-04-28 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 | 1 | -0/+25 |
* | | | | | | | | | Merge branch 'mz/rebase' | Junio C Hamano | 2011-04-28 | 4 | -9/+88 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | rebase: use @{upstream} if no upstream specified | Martin von Zweigbergk | 2011-02-10 | 1 | -9/+18 |
| * | | | | | | | | | rebase -m: remember allow_rerere_autoupdate option | Martin von Zweigbergk | 2011-02-10 | 1 | -0/+21 |
| * | | | | | | | | | rebase: remember strategy and strategy options | Martin von Zweigbergk | 2011-02-10 | 1 | -0/+29 |
| * | | | | | | | | | rebase: stricter check of standalone sub command | Martin von Zweigbergk | 2011-02-10 | 3 | -0/+20 |
* | | | | | | | | | | Merge branch 'en/merge-recursive' | Junio C Hamano | 2011-04-28 | 1 | -0/+63 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | merge-recursive: When we detect we can skip an update, actually skip it | Elijah Newren | 2011-03-02 | 1 | -1/+1 |
| * | | | | | | | | | | t6022: New test checking for unnecessary updates of files in D/F conflicts | Elijah Newren | 2011-03-02 | 1 | -0/+33 |
| * | | | | | | | | | | t6022: New test checking for unnecessary updates of renamed+modified files | Elijah Newren | 2011-03-02 | 1 | -0/+30 |
* | | | | | | | | | | | Merge branch 'jh/dirstat' | Junio C Hamano | 2011-04-28 | 6 | -7/+40 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Teach --dirstat not to completely ignore rearranged lines within a file | Johan Herland | 2011-04-11 | 2 | -2/+1 |
| * | | | | | | | | | | | --dirstat-by-file: Make it faster and more correct | Johan Herland | 2011-04-11 | 2 | -0/+5 |