Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jx/i18n-1.7.11' | Junio C Hamano | 2012-07-31 | 6 | -19/+26 |
|\ | |||||
| * | i18n: merge-recursive: mark strings for translation | Jiang Xin | 2012-07-26 | 2 | -9/+9 |
| * | i18n: Rewrite gettext messages start with dash | Jiang Xin | 2012-07-26 | 1 | -1/+1 |
| * | i18n: rebase: mark messages for translation | Jiang Xin | 2012-07-25 | 3 | -9/+16 |
* | | Merge branch 'rj/maint-grep-remove-redundant-test' | Junio C Hamano | 2012-07-30 | 1 | -11/+0 |
|\ \ | |||||
| * | | t7810-*.sh: Remove redundant test | Ramsay Jones | 2012-07-29 | 1 | -11/+0 |
* | | | Merge branch 'dg/submodule-in-dismembered-working-tree' | Junio C Hamano | 2012-07-30 | 1 | -6/+23 |
|\ \ \ | |||||
| * | | | t7409: make sure submodule is initialized and updated in more detail | Daniel Graña | 2012-07-30 | 1 | -6/+23 |
* | | | | t1100-*.sh: Fix an intermittent test failure | Ramsay Jones | 2012-07-29 | 1 | -0/+1 |
* | | | | t: add missing executable bit to t7409 | Jeff King | 2012-07-29 | 1 | -0/+0 |
* | | | | Merge branch 'extract-remaining' of git://git.bogomips.org/git-svn | Junio C Hamano | 2012-07-27 | 1 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | Extract Git::SVN::GlobSpec from git-svn. | Michael G. Schwern | 2012-07-27 | 1 | -1/+2 |
| * | | | | Move Git::IndexInfo into its own file. | Michael G. Schwern | 2012-07-27 | 1 | -1/+2 |
| * | | | | Extract Git::SVN::Migration from git-svn. | Michael G. Schwern | 2012-07-27 | 1 | -1/+2 |
| * | | | | Extract Git::SVN::Log from git-svn. | Michael G. Schwern | 2012-07-27 | 1 | -2/+4 |
* | | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2012-07-27 | 3 | -0/+54 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Move initialization of Git::SVN variables into Git::SVN. | Michael G. Schwern | 2012-07-27 | 1 | -1/+2 |
| * | | | | Extract some utilities from git-svn to allow extracting Git::SVN. | Michael G. Schwern | 2012-07-27 | 3 | -0/+53 |
* | | | | | Merge branch 'jk/autoident-test' | Junio C Hamano | 2012-07-27 | 1 | -33/+42 |
|\ \ \ \ \ | |||||
| * | | | | | t7502: test early quit from commit with bad ident | Jeff King | 2012-07-26 | 1 | -0/+17 |
| * | | | | | t7502: handle systems where auto-identity is broken | Jeff King | 2012-07-26 | 1 | -3/+10 |
| * | | | | | t7502: drop confusing test_might_fail call | Jeff King | 2012-07-26 | 1 | -1/+1 |
| * | | | | | t7502: narrow checks for author/committer name in template | Jeff King | 2012-07-26 | 1 | -17/+8 |
| * | | | | | t7502: properly quote GIT_EDITOR | Jeff King | 2012-07-26 | 1 | -1/+1 |
| * | | | | | t7502: clean up fake_editor tests | Jeff King | 2012-07-26 | 1 | -13/+7 |
* | | | | | | Merge branch 'dg/submodule-in-dismembered-working-tree' | Junio C Hamano | 2012-07-27 | 1 | -0/+61 |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | git-submodule: work with GIT_DIR/GIT_WORK_TREE | Daniel Graña | 2012-07-25 | 1 | -0/+61 |
| |/ / / | |||||
* | | | | Merge branch 'jc/test-lib-source-build-options-early' | Junio C Hamano | 2012-07-25 | 1 | -23/+22 |
|\ \ \ \ | |||||
| * | | | | test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier | Junio C Hamano | 2012-06-24 | 1 | -23/+22 |
* | | | | | Merge branch 'mm/config-xdg' | Junio C Hamano | 2012-07-25 | 2 | -0/+40 |
|\ \ \ \ \ | |||||
| * | | | | | t1306: check that XDG_CONFIG_HOME works | Jeff King | 2012-07-24 | 1 | -0/+26 |
| * | | | | | ignore: make sure we have an xdg path before using it | Matthieu Moy | 2012-07-24 | 1 | -0/+7 |
| * | | | | | attr: make sure we have an xdg path before using it | Jeff King | 2012-07-24 | 1 | -0/+6 |
| * | | | | | test-lib.sh: unset XDG_CONFIG_HOME | Jeff King | 2012-07-24 | 1 | -0/+1 |
* | | | | | | Merge branch 'cw/rebase-i-root' | Junio C Hamano | 2012-07-25 | 1 | -0/+8 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | rebase -i: handle fixup of root commit correctly | Chris Webb | 2012-07-24 | 1 | -0/+8 |
* | | | | | | t/lib-httpd: handle running under --valgrind | Jeff King | 2012-07-24 | 2 | -1/+8 |
* | | | | | | Merge branch 'jv/maint-no-ext-diff' | Junio C Hamano | 2012-07-23 | 1 | -0/+59 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: test precedence of external diff drivers | Jeff King | 2012-07-19 | 1 | -0/+40 |
| * | | | | | | diff: correctly disable external_diff with --no-ext-diff | Junio C Hamano | 2012-07-17 | 1 | -0/+19 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'kk/maint-commit-tree' | Junio C Hamano | 2012-07-23 | 1 | -0/+17 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree | Junio C Hamano | 2012-07-17 | 1 | -0/+17 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | commit-tree: resurrect command line parsing updates | Junio C Hamano | 2012-07-17 | 1 | -0/+17 |
* | | | | | | | | Merge branch 'as/t4012-style-updates' | Junio C Hamano | 2012-07-22 | 1 | -50/+44 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t4012: Use test_must_fail instead of if-else | Alexander Strasser | 2012-07-16 | 1 | -14/+2 |
| * | | | | | | | | t4012: use 'printf' instead of 'dd' to generate a binary file | Johannes Sixt | 2012-07-16 | 1 | -1/+1 |
| * | | | | | | | | t4012: Re-indent test snippets | Alexander Strasser | 2012-07-16 | 1 | -34/+34 |
| * | | | | | | | | t4012: Make --shortstat test more robust | Alexander Strasser | 2012-07-16 | 1 | -2/+2 |
| * | | | | | | | | t4012: Break up pipe into serial redirections | Alexander Strasser | 2012-07-16 | 1 | -1/+2 |
| * | | | | | | | | t4012: Actually quote the sed script | Alexander Strasser | 2012-07-16 | 1 | -2/+2 |