Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2013-01-08 |
|\ | |||
| * | t1402: work around shell quoting issue on NetBSD | René Scharfe | 2013-01-08 |
| * | Merge branch 'jc/test-portability' into maint | Junio C Hamano | 2013-01-08 |
| |\ | |||
| * \ | Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maint | Junio C Hamano | 2013-01-08 |
| |\ \ | |||
| * \ \ | Merge branch 'jc/maint-test-portability' into maint | Junio C Hamano | 2013-01-08 |
| |\ \ \ | |||
* | \ \ \ | Merge branch 'as/test-name-alias-uniquely' | Junio C Hamano | 2013-01-08 |
|\ \ \ \ \ | |||
| * | | | | | Use longer alias names in subdirectory tests | Aaron Schrab | 2012-12-28 |
* | | | | | | Merge branch 'tb/test-t9810-no-sed-i' | Junio C Hamano | 2013-01-08 |
|\ \ \ \ \ \ | |||
| * | | | | | | t9810: Do not use sed -i | Torsten Bögershausen | 2013-01-01 |
| |/ / / / / | |||
* | | | | | | Merge branch 'tb/test-t9020-no-which' | Junio C Hamano | 2013-01-08 |
|\ \ \ \ \ \ | |||
| * | | | | | | t9020: which is not portable | Torsten Bögershausen | 2013-01-01 |
* | | | | | | | Merge branch 'jk/pathspec-literal' | Junio C Hamano | 2013-01-08 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t6130-pathspec-noglob: Windows does not allow a file named "f*" | Johannes Sixt | 2013-01-06 |
* | | | | | | | | Merge branch 'wk/submodule-update-remote' | Junio C Hamano | 2013-01-05 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | submodule add: If --branch is given, record it in .gitmodules | W. Trevor King | 2012-12-19 |
| * | | | | | | | | submodule update: add --remote for submodule's upstream changes | W. Trevor King | 2012-12-19 |
* | | | | | | | | | Merge branch 'jk/pathspec-literal' | Junio C Hamano | 2013-01-05 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| * | | | | | | | | add global --literal-pathspecs option | Jeff King | 2012-12-19 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jc/format-color-auto' | Junio C Hamano | 2013-01-05 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | log --format: teach %C(auto,black) to respect color config | Junio C Hamano | 2012-12-17 |
| * | | | | | | | | t6006: clean up whitespace | Junio C Hamano | 2012-12-17 |
* | | | | | | | | | Merge branch 'ja/directory-attrs' | Junio C Hamano | 2013-01-05 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Add directory pattern matching to attributes | Jean-Noël AVILA | 2012-12-17 |
* | | | | | | | | | | Merge branch 'jk/mailmap-from-blob' | Junio C Hamano | 2013-01-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | mailmap: default mailmap.blob in bare repositories | Jeff King | 2012-12-13 |
| * | | | | | | | | | | mailmap: support reading mailmap from blobs | Jeff King | 2012-12-12 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'jc/fetch-ignore-symref' | Junio C Hamano | 2013-01-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | fetch: ignore wildcarded refspecs that update local symbolic refs | Junio C Hamano | 2012-12-11 |
| | |/ / / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'cr/push-force-tag-update' | Junio C Hamano | 2013-01-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | push: require force for annotated tags | Chris Rorvick | 2012-12-02 |
| * | | | | | | | | | | push: require force for refs under refs/tags/ | Chris Rorvick | 2012-12-02 |
* | | | | | | | | | | | Merge branch 'fc/fast-export-fixes' | Junio C Hamano | 2013-01-05 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | fast-export: make sure updated refs get updated | Felipe Contreras | 2012-12-03 |
| * | | | | | | | | | | | fast-export: don't handle uninteresting refs | Felipe Contreras | 2012-12-03 |
| * | | | | | | | | | | | fast-export: fix comparison in tests | Felipe Contreras | 2012-11-29 |
| * | | | | | | | | | | | remote-testgit: exercise more features | Felipe Contreras | 2012-11-29 |
| * | | | | | | | | | | | remote-testgit: cleanup tests | Felipe Contreras | 2012-11-29 |
| * | | | | | | | | | | | remote-testgit: remove irrelevant test | Felipe Contreras | 2012-11-29 |
| * | | | | | | | | | | | remote-testgit: remove non-local functionality | Felipe Contreras | 2012-11-29 |
| * | | | | | | | | | | | Add new simplified git-remote-testgit | Felipe Contreras | 2012-11-29 |
| * | | | | | | | | | | | Rename git-remote-testgit to git-remote-testpy | Felipe Contreras | 2012-11-29 |
| * | | | | | | | | | | | remote-helpers: fix failure message | Felipe Contreras | 2012-11-26 |
| * | | | | | | | | | | | fast-export: avoid importing blob marks | Felipe Contreras | 2012-11-26 |
* | | | | | | | | | | | | Merge branch 'jk/fsck-dot-in-trees' | Junio C Hamano | 2013-01-05 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | fsck: warn about ".git" in trees | Jeff King | 2012-11-28 |
| * | | | | | | | | | | | | fsck: warn about '.' and '..' in trees | Jeff King | 2012-11-28 |
* | | | | | | | | | | | | | Merge branch 'as/test-tweaks' | Junio C Hamano | 2013-01-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | tests: paint unexpectedly fixed known breakages in bold red | Adam Spiers | 2012-12-20 |
| * | | | | | | | | | | | | | tests: test the test framework more thoroughly | Adam Spiers | 2012-12-20 |
| * | | | | | | | | | | | | | tests: refactor mechanics of testing in a sub test-lib | Adam Spiers | 2012-12-20 |