summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Merge branch 'ar/clean-rmdir-empty' into maintJunio C Hamano2011-05-042-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/sha1-path-advise' into maintJunio C Hamano2011-05-042-9/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | git-add.txt: document 'add.ignoreErrors'Valentin Haenel2011-05-041-0/+2
* | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-021-5/+15
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-028-41/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | contrib/completion: --notes, --no-notesMichael J Gruber2011-04-141-1/+1
| * | | | | | | | | | | | | | | | | | | log/pretty-options: Document --[no-]notes and deprecate old notes optionsJohan Herland2011-03-302-12/+27
| * | | | | | | | | | | | | | | | | | | revision.c: make --no-notes reset --notes listJeff King2011-03-292-0/+22
| * | | | | | | | | | | | | | | | | | | revision.c: support --notes command-line optionJeff King2011-03-292-5/+32
| * | | | | | | | | | | | | | | | | | | notes: refactor display notes default handlingJeff King2011-03-293-4/+10
| * | | | | | | | | | | | | | | | | | | notes: refactor display notes extra refs fieldJeff King2011-03-293-6/+6
| * | | | | | | | | | | | | | | | | | | revision.c: refactor notes ref expansionJeff King2011-03-291-6/+1
| * | | | | | | | | | | | | | | | | | | notes: make expand_notes_ref globally accessibleJeff King2011-03-293-10/+13
* | | | | | | | | | | | | | | | | | | | Merge branch 'ab/i18n-fixup'Junio C Hamano2011-05-0240-383/+375
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano2011-04-144-19/+10
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18n{grep,cmp} in t7508Junio C Hamano2011-04-141-120/+102
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7506Junio C Hamano2011-04-141-28/+28
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep and test_i18ncmp in t7502Junio C Hamano2011-04-131-41/+31
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7501Junio C Hamano2011-04-131-3/+4
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ncmp in t7500Junio C Hamano2011-04-131-5/+5
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7201Junio C Hamano2011-04-131-7/+7
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110Junio C Hamano2011-04-132-8/+8
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012...Junio C Hamano2011-04-136-17/+15
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014Junio C Hamano2011-04-133-13/+13
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507Junio C Hamano2011-04-133-6/+6
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200Junio C Hamano2011-04-134-19/+21
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in lib-httpd and t2019Junio C Hamano2011-04-132-9/+8
| * | | | | | | | | | | | | | | | | | | | i18n: do not overuse C_LOCALE_OUTPUT (grep)Junio C Hamano2011-04-132-5/+23
| * | | | | | | | | | | | | | | | | | | | i18n: use test_i18ncmp in t1200 and t2200Junio C Hamano2011-04-132-4/+4
| * | | | | | | | | | | | | | | | | | | | i18n: .git file is not a human readable message (t5601)Junio C Hamano2011-04-131-1/+1
| * | | | | | | | | | | | | | | | | | | | i18n: do not overuse C_LOCALE_OUTPUTJunio C Hamano2011-04-122-57/+44
| * | | | | | | | | | | | | | | | | | | | 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 'nm/submodule-update-force'Junio C Hamano2011-05-023-7/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | submodule: Add --force option for git submodule updateNicolas Morey-Chaisemartin2011-04-043-7/+36
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/notes-add-ui'Junio C Hamano2011-05-023-7/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Make "git notes add" more user-friendly when there are existing notesJohan Herland2011-03-303-7/+49
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/maint-setup'Junio C Hamano2011-05-023-45/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Kill off get_relative_cwd()Nguyễn Thái Ngọc Duy2011-03-282-50/+6
| * | | | | | | | | | | | | | | | | | | | | | | setup: return correct prefix if worktree is '/'Nguyễn Thái Ngọc Duy2011-03-283-3/+36
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mz/maint-rename-unmerged'Junio C Hamano2011-05-022-2/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-232-2/+67
* | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-011-2/+7
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/strbuf-setlen-assert'Junio C Hamano2011-05-011-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | strbuf: clarify assertion in strbuf_setlen()René Scharfe2011-04-271-5/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | |