summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Windows: teach getenv to do a case-sensitive searchJohannes Sixt2011-06-061-3/+20
* mingw.c: move definition of mingw_getenv downJohannes Sixt2011-06-061-15/+15
* sh-i18n--envsubst: do not crash when no arguments are givenJohannes Sixt2011-06-061-0/+1
* Makefile: add xgettext target for *.sh filesÆvar Arnfjörð Bjarmason2011-05-141-1/+5
* git-sh-i18n.sh: add GIT_GETTEXT_POISON supportÆvar Arnfjörð Bjarmason2011-05-141-9/+21
* git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappersÆvar Arnfjörð Bjarmason2011-05-144-0/+61
* git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()Ævar Arnfjörð Bjarmason2011-05-145-0/+524
* Update draft release notes to 1.7.6Junio C Hamano2011-05-061-3/+29
* Merge branch 'jn/run-command-error-failure'Junio C Hamano2011-05-063-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
* | Merge branch 'js/info-man-path'Junio C Hamano2011-05-063-5/+21
|\ \
| * | Documentation: clarify meaning of --html-path, --man-path, and --info-pathJonathan Nieder2011-05-021-6/+6
| * | git: add --info-path and --man-path optionsJon Seymour2011-05-013-3/+19
* | | Merge branch 'im/hashcmp-optim'Junio C Hamano2011-05-061-4/+14
|\ \ \
| * | | hashcmp(): inline memcmp() by hand to optimizeIngo Molnar2011-04-281-4/+14
* | | | Merge branch 'jk/merge-one-file-working-tree'Junio C Hamano2011-05-062-1/+106
|\ \ \ \
| * | | | merge-one-file: fix broken merges with alternate work treesJeff King2011-04-292-3/+8
| * | | | add tests for merge-index / merge-one-fileJeff King2011-04-291-0/+100
* | | | | Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-0616-36/+120
|\ \ \ \ \
| * | | | | diff-files: show unmerged entries correctlyJunio C Hamano2011-04-232-2/+95
| * | | | | diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-233-11/+6
| * | | | | diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-232-6/+9
| * | | | | test: use $_z40 from test-libJunio C Hamano2011-04-2312-22/+15
* | | | | | Merge branch 'cj/p4merge'Junio C Hamano2011-05-061-6/+3
|\ \ \ \ \ \
| * | | | | | Pass empty file to p4merge where no base is suitable.Ciaran Jessup2011-05-011-6/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'gr/cvsimport-alternative-cvspass-location'Junio C Hamano2011-05-061-12/+41
|\ \ \ \ \ \
| * | | | | | Look for password in both CVS and CVSNT password files.Guy Rouillier2011-05-011-12/+41
* | | | | | | Merge branch 'sg/completion-cleanup'Junio C Hamano2011-05-061-161/+60
|\ \ \ \ \ \ \
| * | | | | | | completion: remove unnecessary _get_comp_words_by_ref() invocationsSZEDER Gábor2011-04-281-105/+11
| * | | | | | | completion: don't modify the $cur variable in completion functionsSZEDER Gábor2011-04-281-57/+50
* | | | | | | | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-063-3/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | 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-293-3/+13
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/format-patch-quote-special-in-from'Junio C Hamano2011-05-062-1/+103
|\ \ \ \ \ \ \ \
| * | | | | | | | pretty: quote rfc822 specials in email addressesJeff King2011-04-262-1/+102
* | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-0615-172/+151
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pathspec: rename per-item field has_wildcard to use_wildcardJunio C Hamano2011-04-055-8/+9
| * | | | | | | | | Improve tree_entry_interesting() handling codeNguyễn Thái Ngọc Duy2011-03-253-50/+33
| * | | | | | | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-259-29/+62
| * | | | | | | | | Reimplement read_tree_recursive() using tree_entry_interesting()Nguyễn Thái Ngọc Duy2011-03-251-95/+57
| * | | | | | | | | Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'Junio C Hamano2011-03-252-2/+79
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'aw/maint-rebase-i-p-no-ff'Junio C Hamano2011-05-062-2/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-282-2/+32
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mg/alias-expose-prefix'Junio C Hamano2011-05-063-1/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | handle_alias: provide GIT_PREFIX to !aliasMichael J Gruber2011-04-273-1/+21
| * | | | | | | | | | | t1020: test !alias in subdirectoryMichael J Gruber2011-04-271-0/+11
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mg/diff-uiconfig-doc'Junio C Hamano2011-05-062-12/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diffMichael J Gruber2011-04-272-12/+30
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \