summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* index-pack: eliminate unlimited recursion in get_delta_base()nd/index-pack-no-recurseNguyễn Thái Ngọc Duy2012-01-091-9/+21
* index-pack: eliminate recursion in find_unresolved_deltasNguyễn Thái Ngọc Duy2012-01-091-41/+70
* Eliminate recursion in setting/clearing marks in commit listNguyễn Thái Ngọc Duy2012-01-092-18/+40
* Update draft release notes in preparation for 1.7.9-rc0Junio C Hamano2011-12-221-1/+9
* Merge branch 'tr/bash-read-unescaped'Junio C Hamano2011-12-221-6/+6
|\
| * bash completion: use read -r everywheretr/bash-read-unescapedThomas Rast2011-12-211-6/+6
* | Merge branch 'ab/sun-studio-portability'Junio C Hamano2011-12-228-22/+22
|\ \
| * | Appease Sun Studio by renaming "tmpfile"ab/sun-studio-portabilityÆvar Arnfjörð Bjarmason2011-12-214-16/+16
| * | Fix a bitwise negation assignment issue spotted by Sun StudioÆvar Arnfjörð Bjarmason2011-12-213-4/+4
| * | Fix an enum assignment issue spotted by Sun StudioÆvar Arnfjörð Bjarmason2011-12-211-2/+2
| |/
* | Merge branch 'tr/doc-sh-setup'Junio C Hamano2011-12-221-0/+10
|\ \
| * | git-sh-setup: make require_clean_work_tree part of the interfacetr/doc-sh-setupThomas Rast2011-12-201-0/+10
* | | Merge branch 'rr/revert-cherry-pick'Junio C Hamano2011-12-223-49/+90
|\ \ \
| * | | t3502, t3510: clarify cherry-pick -m failurerr/revert-cherry-pickRamkumar Ramachandra2011-12-152-2/+2
| * | | t3510 (cherry-pick-sequencer): use exit statusRamkumar Ramachandra2011-12-151-29/+29
| * | | revert: simplify getting commit subject in format_todo()Ramkumar Ramachandra2011-12-151-5/+5
| * | | revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra2011-12-152-6/+23
| * | | revert: make commit subjects in insn sheet optionalRamkumar Ramachandra2011-12-152-21/+44
| * | | revert: free msg in format_todo()Ramkumar Ramachandra2011-12-151-0/+1
* | | | Merge branch 'tr/pty-all'Junio C Hamano2011-12-221-0/+4
|\ \ \ \
| * | | | test-terminal: set output terminals to raw modetr/pty-allThomas Rast2011-12-191-0/+4
* | | | | Merge branch 'jn/maint-gitweb-utf8-fix'Junio C Hamano2011-12-221-4/+8
|\ \ \ \ \
| * | | | | gitweb: Fix fallback mode of to_utf8 subroutinejn/maint-gitweb-utf8-fixJakub Narebski2011-12-191-2/+2
| * | | | | gitweb: Output valid utf8 in git_blame_common('data')Jürgen Kreileder2011-12-181-1/+3
| * | | | | gitweb: esc_html() site name for title in OPMLJürgen Kreileder2011-12-181-1/+2
| * | | | | gitweb: Call to_utf8() on input string in chop_and_escape_str()Jürgen Kreileder2011-12-181-0/+1
* | | | | | Update draft release notes to 1.7.9Junio C Hamano2011-12-221-27/+39
* | | | | | Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano2011-12-222-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-initJunio C Hamano2011-12-181331-35289/+138034
| |\ \ \ \ \ \
| * | | | | | | commit, merge: initialize static strbufJeff King2011-12-182-2/+2
* | | | | | | | Merge branch 'jc/maint-lf-to-crlf-keep-crlf'Junio C Hamano2011-12-221-10/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | lf_to_crlf_filter(): resurrect CRLF->CRLF hackjc/maint-lf-to-crlf-keep-crlfJunio C Hamano2011-12-181-10/+50
* | | | | | | | | Merge branch 'rs/diff-tree-combined-clean-up'Junio C Hamano2011-12-225-50/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: use diff_tree_combined_merge() instead of diff_tree_combined()rs/diff-tree-combined-clean-upRené Scharfe2011-12-171-11/+3
| * | | | | | | | | pass struct commit to diff_tree_combined_merge()René Scharfe2011-12-173-8/+6
| * | | | | | | | | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-174-37/+26
* | | | | | | | | | Merge branch 'jk/maint-push-v-is-verbose'Junio C Hamano2011-12-221-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | make "git push -v" actually verbosejk/maint-push-v-is-verboseJeff King2011-12-171-5/+5
* | | | | | | | | | | Merge branch 'tr/grep-threading'Junio C Hamano2011-12-224-43/+88
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | grep: disable threading in non-worktree casetr/grep-threadingThomas Rast2011-12-161-18/+18
| * | | | | | | | | | | grep: enable threading with -p and -W using lazy attribute lookupThomas Rast2011-12-163-33/+63
| * | | | | | | | | | | grep: load funcname patterns for -WThomas Rast2011-12-122-3/+18
* | | | | | | | | | | | Merge branch 'jk/pretty-reglog-ent'Junio C Hamano2011-12-225-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pretty: give placeholders to reflog identityjk/pretty-reglog-entJeff King2011-12-165-0/+48
* | | | | | | | | | | | | Merge branch 'jk/follow-rename-score'Junio C Hamano2011-12-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use custom rename score during --followjk/follow-rename-scoreJeff King2011-12-161-0/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/doc-fsck'Junio C Hamano2011-12-221-18/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | docs: brush up obsolete bits of git-fsck manpagejk/doc-fsckJeff King2011-12-161-18/+8
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-2210-17/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit_tree(): refuse commit messages that contain NULsnd/war-on-nul-in-commitNguyễn Thái Ngọc Duy2011-12-152-0/+9