Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2012-01-12 | 1 | -2/+7 |
|\ | |||||
| * | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-12 | 1 | -2/+7 |
| |\ | |||||
| | * | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-12 | 1 | -2/+7 |
| | |\ | |||||
| | | * | thin-pack: try harder to use preferred base objects as base | Jeff King | 2012-01-12 | 1 | -2/+7 |
* | | | | Merge branch 'mh/ref-api-less-extra-refs' | Junio C Hamano | 2012-01-09 | 1 | -29/+22 |
|\ \ \ \ | |||||
| * | | | | write_head_info(): handle "extra refs" locallymh/ref-api-less-extra-refs | Michael Haggerty | 2012-01-06 | 1 | -4/+3 |
| * | | | | show_ref(): remove unused "flag" and "cb_data" arguments | Michael Haggerty | 2012-01-06 | 1 | -5/+5 |
| * | | | | receive-pack: move more work into write_head_info() | Michael Haggerty | 2012-01-06 | 1 | -24/+18 |
* | | | | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 | 3 | -7/+46 |
|\ \ \ \ \ | |||||
| * | | | | | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 | 1 | -1/+2 |
| * | | | | | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag' | Junio C Hamano | 2012-01-05 | 3 | -6/+46 |
| |\ \ \ \ \ | |||||
| | * | | | | | commit: teach --gpg-sign option | Junio C Hamano | 2011-11-12 | 3 | -6/+46 |
* | | | | | | | Merge branch 'jh/fetch-head-update' | Junio C Hamano | 2012-01-06 | 1 | -74/+86 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | write first for-merge ref to FETCH_HEAD firstjh/fetch-head-update | Joey Hess | 2012-01-03 | 1 | -74/+86 |
* | | | | | | | | Sync with 1.7.8.2 | Junio C Hamano | 2011-12-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'jv/maint-config-set' into maint | Junio C Hamano | 2011-12-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix an incorrect reference to --set-all.jv/maint-config-set | Jelmer Vernooij | 2011-12-27 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'jc/checkout-m-twoway' into maint | Junio C Hamano | 2011-12-28 | 1 | -24/+36 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/maint-strbuf-missing-init' into maint | Junio C Hamano | 2011-12-28 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-sequencer-fixes' into maint | Junio C Hamano | 2011-12-28 | 1 | -48/+92 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-mv' into maint | Junio C Hamano | 2011-12-28 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fetch-no-tail-match-refs' into maint | Junio C Hamano | 2011-12-28 | 2 | -7/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ci/stripspace-docs' into maint | Junio C Hamano | 2011-12-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/branch-move-to-self' into maint | Junio C Hamano | 2011-12-28 | 2 | -6/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/sun-studio-portability' | Junio C Hamano | 2011-12-22 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Appease Sun Studio by renaming "tmpfile"ab/sun-studio-portability | Ævar Arnfjörð Bjarmason | 2011-12-21 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | Fix an enum assignment issue spotted by Sun Studio | Ævar Arnfjörð Bjarmason | 2011-12-21 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | Merge branch 'rr/revert-cherry-pick' | Junio C Hamano | 2011-12-22 | 1 | -23/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | revert: simplify getting commit subject in format_todo() | Ramkumar Ramachandra | 2011-12-15 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | revert: tolerate extra spaces, tabs in insn sheet | Ramkumar Ramachandra | 2011-12-15 | 1 | -6/+12 |
| * | | | | | | | | | | | | | | | | revert: make commit subjects in insn sheet optional | Ramkumar Ramachandra | 2011-12-15 | 1 | -21/+16 |
| * | | | | | | | | | | | | | | | | revert: free msg in format_todo() | Ramkumar Ramachandra | 2011-12-15 | 1 | -0/+1 |
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/maint-strbuf-missing-init' | Junio C Hamano | 2011-12-22 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init | Junio C Hamano | 2011-12-18 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | Merge branch 'rs/diff-tree-combined-clean-up' | Junio C Hamano | 2011-12-22 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | use struct sha1_array in diff_tree_combined() | René Scharfe | 2011-12-17 | 1 | -6/+6 |
* | | | | | | | | | | | | | | | | | Merge branch 'tr/grep-threading' | Junio C Hamano | 2011-12-22 | 1 | -15/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | grep: disable threading in non-worktree casetr/grep-threading | Thomas Rast | 2011-12-16 | 1 | -18/+18 |
| * | | | | | | | | | | | | | | | | | grep: enable threading with -p and -W using lazy attribute lookup | Thomas Rast | 2011-12-16 | 1 | -4/+9 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'nd/war-on-nul-in-commit' | Junio C Hamano | 2011-12-22 | 4 | -6/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Convert commit_tree() to take strbuf as message | Nguyễn Thái Ngọc Duy | 2011-12-15 | 4 | -6/+6 |
| * | | | | | | | | | | | | | | | | | merge: abort if fails to commit | Nguyễn Thái Ngọc Duy | 2011-12-15 | 1 | -2/+4 |
* | | | | | | | | | | | | | | | | | | Sync with v1.7.8.1 | Junio C Hamano | 2011-12-21 | 3 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | / / / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | clone: the -o option has nothing to do with <branch> | Carlos Martín Nieto | 2011-12-21 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | builtin/log: remove redundant initialization | Michael Schubert | 2011-12-21 | 1 | -2/+0 |
| * | | | | | | | | | | | | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maint | Junio C Hamano | 2011-12-21 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-12-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | builtin/init-db.c: eliminate -Wformat warning on Solaris | Ævar Arnfjörð Bjarmason | 2011-12-20 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2011-12-20 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |