summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-12-136-41/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Update draft release notes for 1.7.8.1Junio C Hamano2011-12-132-1/+18
| * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle' into maintJunio C Hamano2011-12-131-12/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/index-pack-reject-dups' into maintJunio C Hamano2011-12-134-2/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mf/curl-select-fdset' into maintJunio C Hamano2011-12-132-27/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/misc-cleanups' into maintJunio C Hamano2011-12-1310-95/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-1310-48/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Git 1.7.7.5v1.7.7.5Junio C Hamano2011-12-134-3/+21
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano2011-12-133-5/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2011-12-132-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-134-40/+78
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Git 1.7.6.5v1.7.6.5Junio C Hamano2011-12-134-3/+30
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano2011-12-131-38/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | fetch: create status table using strbufjk/maint-fetch-status-tableJeff King2011-12-091-38/+49
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano2011-12-131-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ml/mailmap' into maint-1.7.6Junio C Hamano2011-12-131-3/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | blame: don't overflow time bufferJeff King2011-12-131-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2011-12-1317-49/+339
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui 0.16gitgui-0.16.0Pat Thoyts2011-12-131-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: handle shell script text filters when loading for blame.Pat Thoyts2011-12-092-11/+37
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming.Samuel Bronson2011-12-071-1/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: added config gui.gcwarning to disable the gc hint messagePat Thoyts2011-11-301-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: set whitespace warnings appropriate to this projectPat Thoyts2011-11-301-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: don't warn for detached head when rebasingBert Wesarg2011-11-051-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: make config gui.warndetachedcommit a booleanBert Wesarg2011-11-052-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: add config value gui.diffopts for passing additional diff optionsTilman Vogel2011-11-053-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: sort the numeric ansi codesPat Thoyts2011-11-041-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: support underline style when parsing diff outputPat Thoyts2011-11-042-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: fix spelling error in sshkey.tclDejan Ribič2011-10-311-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui: include the file path in guitools confirmation dialogBert Wesarg2011-10-211-2/+8