Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tr/userdiff-c-returns-pointer' | Junio C Hamano | 2011-12-13 | 1 | -1/+1 |
|\ | |||||
| * | userdiff: allow * between cpp funcname wordstr/userdiff-c-returns-pointer | Thomas Rast | 2011-12-06 | 1 | -1/+1 |
* | | Merge branch 'bc/maint-apply-check-no-patch' | Junio C Hamano | 2011-12-13 | 3 | -6/+25 |
|\ \ | |||||
| * | | builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patch | Brandon Casey | 2011-12-05 | 2 | -5/+24 |
| * | | t/t4131-apply-fake-ancestor.sh: fix broken test | Brandon Casey | 2011-12-05 | 1 | -1/+1 |
* | | | Merge branch 'nd/ignore-might-be-precious' | Junio C Hamano | 2011-12-13 | 2 | -7/+16 |
|\ \ \ | |||||
| * | | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignorend/ignore-might-be-precious | Nguyễn Thái Ngọc Duy | 2011-11-28 | 2 | -7/+16 |
| * | | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious | Junio C Hamano | 2011-11-28 | 2 | -2/+2 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jn/branch-move-to-self' | Junio C Hamano | 2011-12-13 | 6 | -13/+47 |
|\ \ \ \ \ | |||||
| * | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-self | Jonathan Nieder | 2011-11-28 | 5 | -12/+23 |
| * | | | | | branch: allow a no-op "branch -M <current-branch> HEAD" | Jonathan Nieder | 2011-11-28 | 2 | -1/+24 |
| |/ / / / | |||||
* | | | | | Merge branch 'cn/maint-lf-to-crlf-filter' | Junio C Hamano | 2011-12-13 | 1 | -13/+37 |
|\ \ \ \ \ | |||||
| * | | | | | convert: track state in LF-to-CRLF filter | Carlos Martín Nieto | 2011-11-28 | 1 | -13/+37 |
* | | | | | | Merge branch 'tj/maint-imap-send-remove-unused' | Junio C Hamano | 2011-12-13 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'maint' into tj/imap-send-remove-unusedtj/maint-imap-send-remove-unused | Junio C Hamano | 2011-11-23 | 2374 | -58531/+446169 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | imap-send: Remove unused 'use_namespace' variable | Thomas Jarosch | 2011-11-23 | 1 | -1/+0 |
* | | | | | | | Merge branch 'jk/maint-upload-archive' | Junio C Hamano | 2011-12-13 | 2 | -4/+22 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive | Junio C Hamano | 2011-11-21 | 2 | -4/+22 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | archive: don't let remote clients get unreachable commitsjk/maint-1.6.2-upload-archive | Jeff King | 2011-11-21 | 5 | -8/+27 |
* | | | | | | | | | Merge branch 'jn/gitweb-side-by-side-diff' | Junio C Hamano | 2011-12-13 | 3 | -89/+353 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitweb: Add navigation to select side-by-side diffjn/gitweb-side-by-side-diff | Kato Kazuyoshi | 2011-10-31 | 1 | -0/+23 |
| * | | | | | | | | | gitweb: Use href(-replay=>1,...) for formats links in "commitdiff" | Jakub Narebski | 2011-10-31 | 1 | -8/+8 |
| * | | | | | | | | | t9500: Add basic sanity tests for side-by-side diff in gitweb | Jakub Narebski | 2011-10-31 | 1 | -1/+25 |
| * | | | | | | | | | t9500: Add test for handling incomplete lines in diff by gitweb | Jakub Narebski | 2011-10-31 | 1 | -0/+47 |
| * | | | | | | | | | gitweb: Give side-by-side diff extra CSS styling | Jakub Narebski | 2011-10-31 | 2 | -10/+42 |
| * | | | | | | | | | gitweb: Add a feature to show side-by-side diff | Kato Kazuyoshi | 2011-10-31 | 2 | -11/+122 |
| * | | | | | | | | | gitweb: Extract formatting of diff chunk header | Jakub Narebski | 2011-10-31 | 1 | -47/+67 |
| * | | | | | | | | | gitweb: Refactor diff body line classification | Jakub Narebski | 2011-10-31 | 1 | -30/+37 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-12-13 | 6 | -41/+114 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update draft release notes for 1.7.8.1 | Junio C Hamano | 2011-12-13 | 2 | -1/+18 |
| * | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle' into maint | Junio C Hamano | 2011-12-13 | 1 | -12/+43 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/index-pack-reject-dups' into maint | Junio C Hamano | 2011-12-13 | 4 | -2/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mf/curl-select-fdset' into maint | Junio C Hamano | 2011-12-13 | 2 | -27/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/misc-cleanups' into maint | Junio C Hamano | 2011-12-13 | 10 | -95/+112 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-13 | 10 | -48/+101 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Git 1.7.7.5v1.7.7.5 | Junio C Hamano | 2011-12-13 | 4 | -3/+21 |
| | * | | | | | | | | | | | | | | Merge branch 'ab/clang-lints' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 3 | -5/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 4 | -40/+78 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Git 1.7.6.5v1.7.6.5 | Junio C Hamano | 2011-12-13 | 4 | -3/+30 |
| | | * | | | | | | | | | | | | | | | Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -38/+49 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | fetch: create status table using strbufjk/maint-fetch-status-table | Jeff King | 2011-12-09 | 1 | -38/+49 |
| | | * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ml/mailmap' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -3/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | blame: don't overflow time buffer | Jeff King | 2011-12-13 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://repo.or.cz/git-gui | Junio C Hamano | 2011-12-13 | 17 | -49/+339 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | git-gui 0.16gitgui-0.16.0 | Pat Thoyts | 2011-12-13 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | git-gui: handle shell script text filters when loading for blame. | Pat Thoyts | 2011-12-09 | 2 | -11/+37 |
| * | | | | | | | | | | | | | | | | | | | | | git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming. | Samuel Bronson | 2011-12-07 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | | | | | | | git-gui: added config gui.gcwarning to disable the gc hint message | Pat Thoyts | 2011-11-30 | 1 | -1/+1 |