summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* unpack-trees: add the dry_run flag to unpack_trees_optionsJens Lehmann2011-05-252-3/+4
* Update 1.7.6 draft release notesJunio C Hamano2011-05-231-1/+29
* Merge branch 'tr/add-i-no-escape'Junio C Hamano2011-05-231-0/+19
|\
| * add -i: ignore terminal escape sequencesThomas Rast2011-05-171-0/+19
* | Merge branch 'jm/maint-diff-words-with-sbe'Junio C Hamano2011-05-232-2/+36
|\ \
| * | do not read beyond end of malloc'd bufferJim Meyering2011-05-202-2/+36
* | | Merge branch 'js/mingw-shutdown'Junio C Hamano2011-05-232-0/+10
|\ \ \
| * | | Windows: add a wrapper for the shutdown() system callJohannes Sixt2011-05-182-0/+10
* | | | Merge branch 'ms/ls-remote-exit-with-status'Junio C Hamano2011-05-233-3/+40
|\ \ \ \
| * | | | ls-remote: the --exit-code option reports "no matching refs"Michael Schubert2011-05-183-3/+40
* | | | | Merge branch 'mg/config-symbolic-constants'Junio C Hamano2011-05-234-21/+38
|\ \ \ \ \
| * | | | | config: Give error message when not changing a multivarMichael J Gruber2011-05-171-1/+6
| * | | | | config: define and document exit codesMichael J Gruber2011-05-173-20/+32
| |/ / / /
* | | | | Merge branch 'ab/i18n-scripts-basic'Junio C Hamano2011-05-237-1/+602
|\ \ \ \ \
| * | | | | 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
* | | | | | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-2310-31/+276
|\ \ \ \ \ \
| * | | | | | setup.c: Fix some "symbol not declared" sparse warningsRamsay Jones2011-05-171-2/+2
| * | | | | | t3703: Skip tests using directory name ":" on WindowsJohannes Sixt2011-05-121-2/+6
| * | | | | | revision.c: leave a note for "a lone :" enhancementJunio C Hamano2011-05-111-0/+14
| * | | | | | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+45
| |\ \ \ \ \ \
| * | | | | | | t3703, t4208: add test cases for magic pathspecNguyễn Thái Ngọc Duy2011-05-103-0/+93
| * | | | | | | rev/path disambiguation: further restrict "misspelled index entry" diagJunio C Hamano2011-05-101-2/+11
| * | | | | | | fix overslow :/no-such-string-ever-existed diagnosticsJunio C Hamano2011-05-103-13/+14
| * | | | | | | fix overstrict :<path> diagnosisJunio C Hamano2011-05-101-1/+1
| * | | | | | | grep: use get_pathspec() correctlyJunio C Hamano2011-05-101-7/+1
| * | | | | | | pathspec: drop "lone : means no pathspec" from get_pathspec()Junio C Hamano2011-05-101-3/+0
| * | | | | | | Revert "magic pathspec: add ":(icase)path" to match case insensitively"Junio C Hamano2011-05-102-32/+6
| * | | | | | | magic pathspec: add ":(icase)path" to match case insensitivelyJunio C Hamano2011-04-082-6/+32
| * | | | | | | magic pathspec: futureproof shorthand formJunio C Hamano2011-04-083-8/+18
| * | | | | | | magic pathspec: add tentative ":/path/from/top/level" pathspec supportJunio C Hamano2011-04-062-3/+126
* | | | | | | | Merge branch 'jk/blame-line-porcelain'Junio C Hamano2011-05-234-10/+131
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: add --line-porcelain output formatJeff King2011-05-094-2/+45
| * | | | | | | | blame: refactor porcelain outputJeff King2011-05-091-9/+16
| * | | | | | | | add tests for various blame formatsJeff King2011-05-091-0/+71
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-202-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | git-svn: Fix git svn log --show-commitMichael J Gruber2011-05-202-1/+16
* | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-191-1/+22
* | | | | | | | | Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-190-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+44
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'rg/copy-gecos-username'Junio C Hamano2011-05-191-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | copy_gecos: fix not adding nlen to len when processing "&"Rafael Gieschke2011-05-171-0/+1
* | | | | | | | | | | Merge branch 'jl/submodule-conflicted-gitmodules'Junio C Hamano2011-05-192-6/+117
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Submodules: Don't parse .gitmodules when it contains, merge conflictsJens Lehmann2011-05-142-5/+32
| * | | | | | | | | | | test that git status works with merge conflict in, .gitmodulesHeiko Voigt2011-05-141-4/+88
* | | | | | | | | | | | Merge branch 'jc/replacing'Junio C Hamano2011-05-198-23/+45
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | read_sha1_file(): allow selective bypassing of replacement mechanismJunio C Hamano2011-05-152-5/+12
| * | | | | | | | | | | | inline lookup_replace_object() callsJunio C Hamano2011-05-153-4/+14