summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* i18n: git-submodule "blob" and "submodule" messagesÆvar Arnfjörð Bjarmason2011-05-211-4/+4
* i18n: git-submodule "path not initialized" messageÆvar Arnfjörð Bjarmason2011-05-211-1/+1
* i18n: git-submodule "[...] path is ignored" messageÆvar Arnfjörð Bjarmason2011-05-211-1/+1
* i18n: git-submodule "Entering [...]" messageÆvar Arnfjörð Bjarmason2011-05-211-2/+2
* i18n: git-submodule $errmsg messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+1
* i18n: git-submodule "Submodule change[...]" messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+1
* i18n: git-submodule $update_module say + die messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+1
* i18n: git-am core say messagesÆvar Arnfjörð Bjarmason2011-05-212-3/+4
* git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()Ævar Arnfjörð Bjarmason2011-05-141-0/+51
* Merge branch 'jn/run-command-error-failure'Junio C Hamano2011-05-061-0/+23
|\
| * tests: check error message from run_commandJonathan Nieder2011-04-201-0/+23
* | Merge branch 'jk/merge-one-file-working-tree'Junio C Hamano2011-05-061-0/+100
|\ \
| * | merge-one-file: fix broken merges with alternate work treesJeff King2011-04-291-2/+2
| * | add tests for merge-index / merge-one-fileJeff King2011-04-291-0/+100
* | | Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-0613-22/+102
|\ \ \
| * | | diff-files: show unmerged entries correctlyJunio C Hamano2011-04-231-0/+87
| * | | test: use $_z40 from test-libJunio C Hamano2011-04-2312-22/+15
* | | | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-062-2/+13
|\ \ \ \
| * | | | t/annotate-tests: Use echo & cat instead of sedBrian Gernhardt2011-05-051-1/+2
| * | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-292-2/+12
| | |_|/ | |/| |
* | | | Merge branch 'jk/format-patch-quote-special-in-from'Junio C Hamano2011-05-061-0/+43
|\ \ \ \
| * | | | pretty: quote rfc822 specials in email addressesJeff King2011-04-261-0/+42
* | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-061-0/+22
|\ \ \ \ \
| * | | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-251-0/+22
* | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff'Junio C Hamano2011-05-061-1/+31
|\ \ \ \ \ \
| * | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-281-1/+31
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mg/alias-expose-prefix'Junio C Hamano2011-05-061-0/+21
|\ \ \ \ \ \
| * | | | | | handle_alias: provide GIT_PREFIX to !aliasMichael J Gruber2011-04-271-0/+10
| * | | | | | t1020: test !alias in subdirectoryMichael J Gruber2011-04-271-0/+11
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'maint'Junio C Hamano2011-05-051-3/+2
|\ \ \ \ \ \
| * | | | | | t3701: fix here documentJunio C Hamano2011-05-051-3/+2
| * | | | | | Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-046-7/+40
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/maint-stash-oob' into maintJunio C Hamano2011-05-041-5/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dm/stash-k-i-p' into maintJunio C Hamano2011-05-042-0/+20
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-041-0/+18
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-loosen-safety' into maintJunio C Hamano2011-05-041-4/+16
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/clean-rmdir-empty' into maintJunio C Hamano2011-05-041-0/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/sha1-path-advise' into maintJunio C Hamano2011-05-041-5/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/x-years-12-months' into maintJunio C Hamano2011-04-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ml/test-readme'Junio C Hamano2011-05-041-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t/README: unify documentation of test function argsMathias Lafeldt2011-04-261-8/+9
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mg/rev-list-count-cherry'Junio C Hamano2011-05-041-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rev-list --count: separate count for --cherry-markMichael J Gruber2011-04-261-0/+27
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jk/format-patch-multiline-header'Junio C Hamano2011-05-041-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | format-patch: wrap email addresses after long namesJeff King2011-04-141-0/+15
* | | | | | | | | | | | | | | Merge branch 'jm/mergetool-submodules'Junio C Hamano2011-05-041-3/+287
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mergetool: Teach about submodulesJonathon Mah2011-04-131-3/+287
* | | | | | | | | | | | | | | | Merge branch 'jk/notes-ui-updates'Junio C Hamano2011-05-021-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | revision.c: make --no-notes reset --notes listJeff King2011-03-291-0/+16
| * | | | | | | | | | | | | | | | revision.c: support --notes command-line optionJeff King2011-03-291-0/+22