summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/stream-to-pack'Junio C Hamano2011-12-1616-134/+516
|\
| * bulk-checkin: replace fast-import based implementationjc/stream-to-packJunio C Hamano2011-12-0111-78/+403
| * csum-file: introduce sha1file_checkpointJunio C Hamano2011-11-303-17/+37
| * finish_tmp_packfile(): a helper functionJunio C Hamano2011-10-283-23/+42
| * create_tmp_packfile(): a helper functionJunio C Hamano2011-10-283-9/+16
| * write_pack_header(): a helper functionJunio C Hamano2011-10-283-6/+17
* | Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Junio C Hamano2011-12-161-13/+23
|\ \
| * | rebase -i: interrupt rebase when "commit --amend" failed during "reword"aw/rebase-i-stop-on-failure-to-amendAndrew Wong2011-11-301-13/+23
* | | Merge branch 'jh/fast-import-notes'Junio C Hamano2011-12-162-8/+83
|\ \ \
| * | | fast-import: Fix incorrect fanout level when modifying existing notes refsjh/fast-import-notesJohan Herland2011-11-282-7/+29
| * | | t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handlingJohan Herland2011-11-281-0/+54
| * | | t9301: Fix testcase covering up a bug in fast-import's notes fanout handlingJohan Herland2011-11-281-7/+6
* | | | Merge branch 'jk/upload-archive-use-start-command'Junio C Hamano2011-12-164-36/+19
|\ \ \ \
| * | | | upload-archive: use start_command instead of forkjk/upload-archive-use-start-commandJeff King2011-11-214-36/+19
* | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2011-12-161-45/+65
|\ \ \ \ \
| * | | | | gitk: Make vi-style keybindings more vi-likeJonathan Nieder2011-10-081-6/+6
| * | | | | gitk: Make "touching paths" search support backslashesYggy King2011-07-241-1/+6
| * | | | | gitk: Show modified files with separate work treeMartin von Zweigbergk2011-07-241-6/+11
| * | | | | gitk: Simplify calculation of gitdirMartin von Zweigbergk2011-07-241-14/+1
| * | | | | gitk: Run 'git rev-parse --git-dir' only onceMartin von Zweigbergk2011-07-241-2/+4
| * | | | | gitk: Put temporary directory inside .gitMartin von Zweigbergk2011-07-241-2/+1
| * | | | | gitk: Fix "External diff" with separate work treeMartin von Zweigbergk2011-07-241-2/+3
| * | | | | gitk: Fix "blame parent commit" with separate work treeMartin von Zweigbergk2011-07-241-2/+2
| * | | | | gitk: Fix "show origin of this line" with separate work treeMartin von Zweigbergk2011-07-241-2/+2
| * | | | | gitk: Fix file highlight when run in subdirectoryMartin von Zweigbergk2011-07-241-1/+10
| * | | | | gitk: Update copyrightPaul Mackerras2011-07-241-2/+2
| * | | | | gitk: When a commit contains a note, mark it with a yellow boxRaphael Zimmerer2011-05-291-1/+16
| * | | | | gitk: Remember time zones from author and commit timestampsAnders Kaseorg2011-05-291-4/+4
| * | | | | gitk: Remove unused $cdate arrayAnders Kaseorg2011-05-291-4/+1
* | | | | | Update draft release notes to 1.7.9Junio C Hamano2011-12-131-4/+38
* | | | | | Merge branch 'ks/tag-cleanup'Junio C Hamano2011-12-132-14/+60
|\ \ \ \ \ \
| * | | | | | git-tag: introduce --cleanup optionks/tag-cleanupKirill A. Shutemov2011-12-092-14/+60
* | | | | | | Merge branch 'jl/submodule-status-failure-report'Junio C Hamano2011-12-131-2/+2
|\ \ \ \ \ \ \
| * | | | | | | diff/status: print submodule path when looking for changes failsjl/submodule-status-failure-reportJens Lehmann2011-12-081-2/+2
* | | | | | | | Merge branch 'tr/userdiff-c-returns-pointer'Junio C Hamano2011-12-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | userdiff: allow * between cpp funcname wordstr/userdiff-c-returns-pointerThomas Rast2011-12-061-1/+1
* | | | | | | | | Merge branch 'bc/maint-apply-check-no-patch'Junio C Hamano2011-12-133-6/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patchBrandon Casey2011-12-052-5/+24
| * | | | | | | | | t/t4131-apply-fake-ancestor.sh: fix broken testBrandon Casey2011-12-051-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/ignore-might-be-precious'Junio C Hamano2011-12-132-7/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignorend/ignore-might-be-preciousNguyễn Thái Ngọc Duy2011-11-282-7/+16
| * | | | | | | | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousJunio C Hamano2011-11-282-2/+2
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'jn/branch-move-to-self'Junio C Hamano2011-12-136-13/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-285-12/+23
| * | | | | | | | | | | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-282-1/+24
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'cn/maint-lf-to-crlf-filter'Junio C Hamano2011-12-131-13/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | convert: track state in LF-to-CRLF filterCarlos Martín Nieto2011-11-281-13/+37
* | | | | | | | | | | | Merge branch 'tj/maint-imap-send-remove-unused'Junio C Hamano2011-12-131-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint' into tj/imap-send-remove-unusedtj/maint-imap-send-remove-unusedJunio C Hamano2011-11-232374-58531/+446169
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | imap-send: Remove unused 'use_namespace' variableThomas Jarosch2011-11-231-1/+0