Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'js/add-e-submodule-fix' into maint | Junio C Hamano | 2012-02-13 |
|\ | |||
| * | add -e: do not show difference in a submodule that is merely dirty | Johannes Schindelin | 2012-02-07 |
* | | 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 |
| |/ / / | |||
* | | | | 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 'cb/push-quiet' into maint | Junio C Hamano | 2012-02-05 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||
| * | | | | fix push --quiet: add 'quiet' capability to receive-pack | Clemens Buchacher | 2012-01-08 |
| * | | | | server_supports(): parse feature list more carefully | Junio C Hamano | 2012-01-08 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-12 |
|\ \ \ \ \ | |||
| * \ \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-12 |
| |\ \ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-12 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||
| | | * | | | | thin-pack: try harder to use preferred base objects as base | Jeff King | 2012-01-12 |
* | | | | | | | Merge branch 'mh/ref-api-less-extra-refs' | Junio C Hamano | 2012-01-09 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| * | | | | | | write_head_info(): handle "extra refs" locally | Michael Haggerty | 2012-01-06 |
| * | | | | | | show_ref(): remove unused "flag" and "cb_data" arguments | Michael Haggerty | 2012-01-06 |
| * | | | | | | receive-pack: move more work into write_head_info() | Michael Haggerty | 2012-01-06 |
* | | | | | | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 |
| * | | | | | | | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag' | Junio C Hamano | 2012-01-05 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | commit: teach --gpg-sign option | Junio C Hamano | 2011-11-12 |
* | | | | | | | | | 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 |
* | | | | | | | | | | Sync with 1.7.8.2 | Junio C Hamano | 2011-12-28 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge branch 'jv/maint-config-set' into maint | Junio C Hamano | 2011-12-28 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | Fix an incorrect reference to --set-all. | Jelmer Vernooij | 2011-12-27 |
| * | | | | | | | | | Merge branch 'jc/checkout-m-twoway' into maint | Junio C Hamano | 2011-12-28 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-strbuf-missing-init' into maint | Junio C Hamano | 2011-12-28 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-sequencer-fixes' into maint | Junio C Hamano | 2011-12-28 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-mv' into maint | Junio C Hamano | 2011-12-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fetch-no-tail-match-refs' into maint | Junio C Hamano | 2011-12-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ci/stripspace-docs' into maint | Junio C Hamano | 2011-12-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/branch-move-to-self' into maint | Junio C Hamano | 2011-12-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/sun-studio-portability' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | Appease Sun Studio by renaming "tmpfile" | Ævar Arnfjörð Bjarmason | 2011-12-21 |
| * | | | | | | | | | | | | | | | | | Fix an enum assignment issue spotted by Sun Studio | Ævar Arnfjörð Bjarmason | 2011-12-21 |
* | | | | | | | | | | | | | | | | | | Merge branch 'rr/revert-cherry-pick' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | revert: simplify getting commit subject in format_todo() | Ramkumar Ramachandra | 2011-12-15 |
| * | | | | | | | | | | | | | | | | | | revert: tolerate extra spaces, tabs in insn sheet | Ramkumar Ramachandra | 2011-12-15 |
| * | | | | | | | | | | | | | | | | | | revert: make commit subjects in insn sheet optional | Ramkumar Ramachandra | 2011-12-15 |
| * | | | | | | | | | | | | | | | | | | revert: free msg in format_todo() | Ramkumar Ramachandra | 2011-12-15 |
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-strbuf-missing-init' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | Update jk/maint-strbuf-missing-init to builtin/ rename | Junio C Hamano | 2011-12-18 |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-tree-combined-clean-up' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | use struct sha1_array in diff_tree_combined() | René Scharfe | 2011-12-17 |
* | | | | | | | | | | | | | | | | | | Merge branch 'tr/grep-threading' | Junio C Hamano | 2011-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |