Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/parse-date-raw' into maint | Junio C Hamano | 2012-02-13 |
|\ | |||
| * | parse_date(): '@' prefix forces git-timestamp | Junio C Hamano | 2012-02-03 |
* | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint | Junio C Hamano | 2012-02-13 |
|\ \ | |||
| * | | merge: do not create a signed tag merge under --ff-only option | Junio C Hamano | 2012-02-05 |
* | | | Merge branch 'jc/branch-desc-typoavoidance' into maint | Junio C Hamano | 2012-02-13 |
|\ \ \ | |||
| * | | | branch --edit-description: protect against mistyped branch name | Junio C Hamano | 2012-02-05 |
| * | | | tests: add write_script helper function | Junio C Hamano | 2012-02-03 |
| |/ / | |||
* | | | t: use sane_unset instead of unset | Ævar Arnfjörð Bjarmason | 2012-02-13 |
* | | | Remove Git's support for smoke testing | Ævar Arnfjörð Bjarmason | 2012-02-13 |
* | | | Merge branch 'jc/maint-request-pull-for-tag' into maint | Junio C Hamano | 2012-02-10 |
|\ \ \ | |||
| * | | | request-pull: explicitly ask tags/$name to be pulled | Junio C Hamano | 2012-01-31 |
* | | | | Merge branch 'tr/grep-l-with-decoration' into maint | Junio C Hamano | 2012-02-10 |
|\ \ \ \ | |||
| * | | | | grep: fix -l/-L interaction with decoration lines | Albert Yale | 2012-01-23 |
* | | | | | Merge branch 'jl/submodule-re-add' into maint | Junio C Hamano | 2012-02-10 |
|\ \ \ \ \ | |||
| * | | | | | submodule add: fix breakage when re-adding a deep submodule | Jens Lehmann | 2012-01-24 |
* | | | | | | Merge branch 'da/maint-mergetool-twoway' into maint | Junio C Hamano | 2012-02-10 |
|\ \ \ \ \ \ | |||
| * | | | | | | mergetool: Provide an empty file when needed | David Aguilar | 2012-01-23 |
* | | | | | | | Merge branch 'sp/smart-http-failure-to-push' into maint | Junio C Hamano | 2012-02-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | remote-curl: Fix push status report when all branches fail | Shawn O. Pearce | 2012-01-20 |
* | | | | | | | | Merge branch 'jc/maint-log-first-parent-pathspec' into maint | Junio C Hamano | 2012-02-05 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Making pathspec limited log play nicer with --first-parent | Junio C Hamano | 2012-01-19 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'cb/push-quiet' into maint | Junio C Hamano | 2012-02-05 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| * | | | | | | | t5541: avoid TAP test miscounting | Michael J Gruber | 2012-01-08 |
| * | | | | | | | fix push --quiet: add 'quiet' capability to receive-pack | Clemens Buchacher | 2012-01-08 |
* | | | | | | | | Merge branch 'nd/pathspec-recursion-cleanup' | Junio C Hamano | 2012-01-18 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | diff-index: enable recursive pathspec matching in unpack_trees | Nguyen Thai Ngoc Duy | 2012-01-16 |
| | |_|_|_|_|/ / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'tr/maint-word-diff-incomplete-line' | Junio C Hamano | 2012-01-18 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||
| * | | | | | | | word-diff: ignore '\ No newline at eof' marker | Thomas Rast | 2012-01-12 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'ss/maint-msys-cvsexportcommit' | Junio C Hamano | 2012-01-12 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t9200: On MSYS, do not pass Windows-style paths to CVS | Sebastian Schuberth | 2012-01-11 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-11 |
|\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-11 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | * | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-11 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||
| | | * | | | | | | t2203: fix wrong commit command | Nguyễn Thái Ngọc Duy | 2012-01-11 |
* | | | | | | | | | Merge branch 'bw/maint-t8006-sed-incomplete-line' | Junio C Hamano | 2012-01-10 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Use perl instead of sed for t8006-blame-textconv test | Ben Walton | 2012-01-09 |
* | | | | | | | | | | Sync with maint | Junio C Hamano | 2012-01-10 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | | |||
| * | | | | | | | | Merge the attributes fix in from maint-1.6.7 branch | Junio C Hamano | 2012-01-10 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||
| | * | | | | | | | Merge the attributes fix in from maint-1.6.6 branch | Junio C Hamano | 2012-01-10 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||
| | | * | | | | | | attr: don't confuse prefixes with leading directories | Jeff King | 2012-01-10 |
* | | | | | | | | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 |
| * | | | | | | | | | test "commit -S" and "log --show-signature" | Junio C Hamano | 2011-11-12 |
* | | | | | | | | | | Merge branch 'jm/stash-diff-disambiguate' | Junio C Hamano | 2012-01-06 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | stash: Don't fail if work dir contains file named 'HEAD' | Jonathon Mah | 2012-01-01 |
* | | | | | | | | | | | Merge branch 'jh/fetch-head-update' | Junio C Hamano | 2012-01-06 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | write first for-merge ref to FETCH_HEAD first | Joey Hess | 2012-01-03 |
| |/ / / / / / / / / / | |||
* | | | | | | | | | | | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-06 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | git-p4: rewrite view handling | Pete Wyckoff | 2012-01-03 |
| * | | | | | | | | | | | git-p4: support single file p4 client view maps | Gary Gibbons | 2012-01-03 |