Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | unpack-trees: add the dry_run flag to unpack_trees_options | Jens Lehmann | 2011-05-25 | 2 | -3/+4 |
* | Update 1.7.6 draft release notes | Junio C Hamano | 2011-05-23 | 1 | -1/+29 |
* | Merge branch 'tr/add-i-no-escape' | Junio C Hamano | 2011-05-23 | 1 | -0/+19 |
|\ | |||||
| * | add -i: ignore terminal escape sequences | Thomas Rast | 2011-05-17 | 1 | -0/+19 |
* | | Merge branch 'jm/maint-diff-words-with-sbe' | Junio C Hamano | 2011-05-23 | 2 | -2/+36 |
|\ \ | |||||
| * | | do not read beyond end of malloc'd buffer | Jim Meyering | 2011-05-20 | 2 | -2/+36 |
* | | | Merge branch 'js/mingw-shutdown' | Junio C Hamano | 2011-05-23 | 2 | -0/+10 |
|\ \ \ | |||||
| * | | | Windows: add a wrapper for the shutdown() system call | Johannes Sixt | 2011-05-18 | 2 | -0/+10 |
* | | | | Merge branch 'ms/ls-remote-exit-with-status' | Junio C Hamano | 2011-05-23 | 3 | -3/+40 |
|\ \ \ \ | |||||
| * | | | | ls-remote: the --exit-code option reports "no matching refs" | Michael Schubert | 2011-05-18 | 3 | -3/+40 |
* | | | | | Merge branch 'mg/config-symbolic-constants' | Junio C Hamano | 2011-05-23 | 4 | -21/+38 |
|\ \ \ \ \ | |||||
| * | | | | | config: Give error message when not changing a multivar | Michael J Gruber | 2011-05-17 | 1 | -1/+6 |
| * | | | | | config: define and document exit codes | Michael J Gruber | 2011-05-17 | 3 | -20/+32 |
| |/ / / / | |||||
* | | | | | Merge branch 'ab/i18n-scripts-basic' | Junio C Hamano | 2011-05-23 | 7 | -1/+602 |
|\ \ \ \ \ | |||||
| * | | | | | Makefile: add xgettext target for *.sh files | Ævar Arnfjörð Bjarmason | 2011-05-14 | 1 | -1/+5 |
| * | | | | | git-sh-i18n.sh: add GIT_GETTEXT_POISON support | Ævar Arnfjörð Bjarmason | 2011-05-14 | 1 | -9/+21 |
| * | | | | | git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers | Ævar Arnfjörð Bjarmason | 2011-05-14 | 4 | -0/+61 |
| * | | | | | git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext() | Ævar Arnfjörð Bjarmason | 2011-05-14 | 5 | -0/+524 |
* | | | | | | Merge branch 'jc/magic-pathspec' | Junio C Hamano | 2011-05-23 | 10 | -31/+276 |
|\ \ \ \ \ \ | |||||
| * | | | | | | setup.c: Fix some "symbol not declared" sparse warnings | Ramsay Jones | 2011-05-17 | 1 | -2/+2 |
| * | | | | | | t3703: Skip tests using directory name ":" on Windows | Johannes Sixt | 2011-05-12 | 1 | -2/+6 |
| * | | | | | | revision.c: leave a note for "a lone :" enhancement | Junio C Hamano | 2011-05-11 | 1 | -0/+14 |
| * | | | | | | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 2 | -52/+45 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | t3703, t4208: add test cases for magic pathspec | Nguyễn Thái Ngọc Duy | 2011-05-10 | 3 | -0/+93 |
| * | | | | | | | rev/path disambiguation: further restrict "misspelled index entry" diag | Junio C Hamano | 2011-05-10 | 1 | -2/+11 |
| * | | | | | | | fix overslow :/no-such-string-ever-existed diagnostics | Junio C Hamano | 2011-05-10 | 3 | -13/+14 |
| * | | | | | | | fix overstrict :<path> diagnosis | Junio C Hamano | 2011-05-10 | 1 | -1/+1 |
| * | | | | | | | grep: use get_pathspec() correctly | Junio C Hamano | 2011-05-10 | 1 | -7/+1 |
| * | | | | | | | pathspec: drop "lone : means no pathspec" from get_pathspec() | Junio C Hamano | 2011-05-10 | 1 | -3/+0 |
| * | | | | | | | Revert "magic pathspec: add ":(icase)path" to match case insensitively" | Junio C Hamano | 2011-05-10 | 2 | -32/+6 |
| * | | | | | | | magic pathspec: add ":(icase)path" to match case insensitively | Junio C Hamano | 2011-04-08 | 2 | -6/+32 |
| * | | | | | | | magic pathspec: futureproof shorthand form | Junio C Hamano | 2011-04-08 | 3 | -8/+18 |
| * | | | | | | | magic pathspec: add tentative ":/path/from/top/level" pathspec support | Junio C Hamano | 2011-04-06 | 2 | -3/+126 |
* | | | | | | | | Merge branch 'jk/blame-line-porcelain' | Junio C Hamano | 2011-05-23 | 4 | -10/+131 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | blame: add --line-porcelain output format | Jeff King | 2011-05-09 | 4 | -2/+45 |
| * | | | | | | | | blame: refactor porcelain output | Jeff King | 2011-05-09 | 1 | -9/+16 |
| * | | | | | | | | add tests for various blame formats | Jeff King | 2011-05-09 | 1 | -0/+71 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-20 | 2 | -1/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-svn: Fix git svn log --show-commit | Michael J Gruber | 2011-05-20 | 2 | -1/+16 |
* | | | | | | | | | Update draft release notes to 1.7.6 | Junio C Hamano | 2011-05-19 | 1 | -1/+22 |
* | | | | | | | | | Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-19 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 2 | -52/+44 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rg/copy-gecos-username' | Junio C Hamano | 2011-05-19 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | copy_gecos: fix not adding nlen to len when processing "&" | Rafael Gieschke | 2011-05-17 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'jl/submodule-conflicted-gitmodules' | Junio C Hamano | 2011-05-19 | 2 | -6/+117 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Submodules: Don't parse .gitmodules when it contains, merge conflicts | Jens Lehmann | 2011-05-14 | 2 | -5/+32 |
| * | | | | | | | | | | | test that git status works with merge conflict in, .gitmodules | Heiko Voigt | 2011-05-14 | 1 | -4/+88 |
* | | | | | | | | | | | | Merge branch 'jc/replacing' | Junio C Hamano | 2011-05-19 | 8 | -23/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | read_sha1_file(): allow selective bypassing of replacement mechanism | Junio C Hamano | 2011-05-15 | 2 | -5/+12 |
| * | | | | | | | | | | | | inline lookup_replace_object() calls | Junio C Hamano | 2011-05-15 | 3 | -4/+14 |