summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | Merge branch 'jk/maint-upload-archive'Junio C Hamano2011-12-132-4/+22
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archiveJunio C Hamano2011-11-212-4/+22
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | archive: don't let remote clients get unreachable commitsjk/maint-1.6.2-upload-archiveJeff King2011-11-215-8/+27
* | | | | | | | | | | | | Merge branch 'jn/gitweb-side-by-side-diff'Junio C Hamano2011-12-133-89/+353
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitweb: Add navigation to select side-by-side diffjn/gitweb-side-by-side-diffKato Kazuyoshi2011-10-311-0/+23
| * | | | | | | | | | | | | gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"Jakub Narebski2011-10-311-8/+8
| * | | | | | | | | | | | | t9500: Add basic sanity tests for side-by-side diff in gitwebJakub Narebski2011-10-311-1/+25
| * | | | | | | | | | | | | t9500: Add test for handling incomplete lines in diff by gitwebJakub Narebski2011-10-311-0/+47
| * | | | | | | | | | | | | gitweb: Give side-by-side diff extra CSS stylingJakub Narebski2011-10-312-10/+42
| * | | | | | | | | | | | | gitweb: Add a feature to show side-by-side diffKato Kazuyoshi2011-10-312-11/+122
| * | | | | | | | | | | | | gitweb: Extract formatting of diff chunk headerJakub Narebski2011-10-311-47/+67
| * | | | | | | | | | | | | gitweb: Refactor diff body line classificationJakub Narebski2011-10-311-30/+37
View Lorry Controller Status