Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 1.7.8.2 | Junio C Hamano | 2011-12-28 | 2 | -1/+72 |
|\ | |||||
| * | Git 1.7.8.2v1.7.8.2 | Junio C Hamano | 2011-12-28 | 3 | -2/+73 |
| * | 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 'jk/follow-rename-score' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/checkout-m-twoway' into maint | Junio C Hamano | 2011-12-28 | 2 | -24/+85 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'tr/doc-sh-setup' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+10 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/maint-strbuf-missing-init' into maint | Junio C Hamano | 2011-12-28 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/maint-push-v-is-verbose' into maint | Junio C Hamano | 2011-12-28 | 1 | -5/+5 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/http-push-to-empty' into maint | Junio C Hamano | 2011-12-28 | 2 | -3/+36 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/doc-fsck' into maint | Junio C Hamano | 2011-12-28 | 1 | -18/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint | Junio C Hamano | 2011-12-28 | 1 | -10/+50 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ef/setenv-putenv' into maint | Junio C Hamano | 2011-12-28 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/advice-doc' into maint | Junio C Hamano | 2011-12-28 | 1 | -11/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/maint-sequencer-fixes' into maint | Junio C Hamano | 2011-12-28 | 6 | -126/+252 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-snprintf-va-copy' into maint | Junio C Hamano | 2011-12-28 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-push-over-dav' into maint | Junio C Hamano | 2011-12-28 | 7 | -5/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-mv' into maint | Junio C Hamano | 2011-12-28 | 2 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fetch-no-tail-match-refs' into maint | Junio C Hamano | 2011-12-28 | 8 | -41/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/keepalive' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ci/stripspace-docs' into maint | Junio C Hamano | 2011-12-28 | 2 | -7/+64 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/fast-import-notes' into maint | Junio C Hamano | 2011-12-28 | 2 | -8/+83 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint | Junio C Hamano | 2011-12-28 | 1 | -13/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tj/maint-imap-send-remove-unused' into maint | Junio C Hamano | 2011-12-28 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/branch-move-to-self' into maint | Junio C Hamano | 2011-12-28 | 6 | -13/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'na/strtoimax' into maint | Junio C Hamano | 2011-12-28 | 4 | -13/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/refresh-porcelain-output' into maint | Junio C Hamano | 2011-12-28 | 1 | -10/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes in preparation for 1.7.9-rc0 | Junio C Hamano | 2011-12-22 | 1 | -1/+9 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/bash-read-unescaped' | Junio C Hamano | 2011-12-22 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | bash completion: use read -r everywheretr/bash-read-unescaped | Thomas Rast | 2011-12-21 | 1 | -6/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/sun-studio-portability' | Junio C Hamano | 2011-12-22 | 8 | -22/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Appease Sun Studio by renaming "tmpfile"ab/sun-studio-portability | Ævar Arnfjörð Bjarmason | 2011-12-21 | 4 | -16/+16 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bitwise negation assignment issue spotted by Sun Studio | Ævar Arnfjörð Bjarmason | 2011-12-21 | 3 | -4/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an enum assignment issue spotted by Sun Studio | Ævar Arnfjörð Bjarmason | 2011-12-21 | 1 | -2/+2 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/doc-sh-setup' | Junio C Hamano | 2011-12-22 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-sh-setup: make require_clean_work_tree part of the interfacetr/doc-sh-setup | Thomas Rast | 2011-12-20 | 1 | -0/+10 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/revert-cherry-pick' | Junio C Hamano | 2011-12-22 | 3 | -49/+90 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t3502, t3510: clarify cherry-pick -m failurerr/revert-cherry-pick | Ramkumar Ramachandra | 2011-12-15 | 2 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t3510 (cherry-pick-sequencer): use exit status | Ramkumar Ramachandra | 2011-12-15 | 1 | -29/+29 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -6/+23 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | revert: make commit subjects in insn sheet optional | Ramkumar Ramachandra | 2011-12-15 | 2 | -21/+44 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | revert: free msg in format_todo() | Ramkumar Ramachandra | 2011-12-15 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/pty-all' | Junio C Hamano | 2011-12-22 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | test-terminal: set output terminals to raw modetr/pty-all | Thomas Rast | 2011-12-19 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-gitweb-utf8-fix' | Junio C Hamano | 2011-12-22 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Fix fallback mode of to_utf8 subroutinejn/maint-gitweb-utf8-fix | Jakub Narebski | 2011-12-19 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Output valid utf8 in git_blame_common('data') | Jürgen Kreileder | 2011-12-18 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: esc_html() site name for title in OPML | Jürgen Kreileder | 2011-12-18 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Call to_utf8() on input string in chop_and_escape_str() | Jürgen Kreileder | 2011-12-18 | 1 | -0/+1 |