summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-11-131-227/+810
|\
| * gitk: Fix linehtag undefined error with file highlightingPaul Mackerras2008-11-131-2/+5
| * gitk: Fix commit encoding supportAlexander Gavrilov2008-11-131-2/+23
| * gitk: Fix transient windows on Win32 and MacOSAlexander Gavrilov2008-11-131-13/+31
| * gitk: Add accelerators to frequently used menu commandsAlexander Gavrilov2008-11-131-7/+29
| * Merge branch 'dev'Paul Mackerras2008-11-091-177/+177
| |\
| | * gitk: Cope with unmerged files in local changesPaul Mackerras2008-11-041-3/+17
| | * gitk: Make "show origin of this line" work on fake commitsPaul Mackerras2008-11-041-3/+61
| | * gitk: Unify handling of merge diffs with normal 2-way diffsPaul Mackerras2008-11-021-171/+99
| * | gitk: Implement a user-friendly Edit View dialogAlexander Gavrilov2008-11-081-44/+163
| * | gitk: Improve cherry-pick error handlingPaul Mackerras2008-11-081-9/+16
| * | gitk: Make cherry-pick call git-citool on conflictsAlexander Gavrilov2008-11-071-1/+39
| * | gitk: Make gitk dialog windows transientAlexander Gavrilov2008-11-071-18/+28
| * | gitk: Add Return and Escape bindings to dialogsAlexander Gavrilov2008-11-071-0/+21
| |/
| * gitk: Make the background color of marked lines configurablePaul Mackerras2008-10-271-4/+12
| * gitk: Add a menu item to show where a given line comes fromPaul Mackerras2008-10-271-7/+153
| * gitk: Fix some off-by-one errors in computing which line to blamePaul Mackerras2008-10-271-27/+33
| * gitk: Allow starting gui blame for a specific lineAlexander Gavrilov2008-10-261-2/+146
| * gitk: Fix file list context menu for merge commitsAlexander Gavrilov2008-10-211-2/+4
| * gitk: Allow forcing branch creation if it already existsAlexander Gavrilov2008-10-211-5/+23
* | Update draft release notes to 1.6.1Junio C Hamano2008-11-121-1/+33
* | Merge branch 'jn/gitweb-customlinks'Junio C Hamano2008-11-121-7/+12
|\ \
| * | gitweb: Better processing format string in custom links in navbarJakub Narebski2008-10-121-7/+12
* | | Merge branch 'gb/gitweb-snapshot-pathinfo'Junio C Hamano2008-11-121-8/+63
|\ \ \
| * | | gitweb: embed snapshot format parameter in PATH_INFOGiuseppe Bilotta2008-11-021-0/+17
| * | | gitweb: retrieve snapshot format from PATH_INFOGiuseppe Bilotta2008-11-021-0/+39
| * | | gitweb: make the supported snapshot formats array globalGiuseppe Bilotta2008-11-021-8/+7
* | | | Merge branch 'ds/uintmax-config' (early part)Junio C Hamano2008-11-123-1/+36
|\ \ \ \
| * | | | Add autoconf tests for pthreadsDavid M. Syzdek2008-11-092-0/+17
| * | | | Make Pthread link flags configurableDavid M. Syzdek2008-11-021-1/+3
| * | | | Add Makefile check for FreeBSD 4.9-SECURITYDavid M. Syzdek2008-11-021-0/+4
| * | | | Build: add NO_UINTMAX_T to support ancient systemsDavid M. Syzdek2008-11-023-0/+12
* | | | | Merge branch 'jk/maint-commit-v-strip'Junio C Hamano2008-11-122-3/+78
|\ \ \ \ \
| * | | | | commit: Fix stripping of patch in verbose mode.Jeff King2008-11-122-3/+78
* | | | | | Merge branch 'np/pack-safer'Junio C Hamano2008-11-128-49/+224
|\ \ \ \ \ \
| * | | | | | t5303: fix printf format string for portabilityJunio C Hamano2008-11-091-1/+1
| * | | | | | t5303: work around printf breakage in dashJunio C Hamano2008-11-091-1/+1
| * | | | | | pack-objects: don't leak pack window reference when splitting packsNicolas Pitre2008-11-021-3/+9
| * | | | | | extend test coverage for latest pack corruption resilience improvementsNicolas Pitre2008-11-021-7/+89
| * | | | | | pack-objects: allow "fixing" a corrupted pack without a full repackNicolas Pitre2008-11-021-9/+19
| * | | | | | make find_pack_revindex() aware of the nasty worldNicolas Pitre2008-11-023-7/+16
| * | | | | | make check_object() resilient to pack corruptionsNicolas Pitre2008-11-021-6/+17
| * | | | | | make packed_object_info() resilient to pack corruptionsNicolas Pitre2008-11-021-6/+30
| * | | | | | make unpack_object_header() non fatalNicolas Pitre2008-11-023-11/+13
| * | | | | | better validation on delta base object offsetsNicolas Pitre2008-11-024-4/+6
| * | | | | | close another possibility for propagating pack corruptionNicolas Pitre2008-11-024-1/+30
* | | | | | | Merge branch 'mk/maint-cg-push'Junio C Hamano2008-11-123-5/+75
|\ \ \ \ \ \ \
| * | | | | | | git push: Interpret $GIT_DIR/branches in a Cogito compatible wayMartin Koegler2008-11-113-5/+75
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'bc/maint-keep-pack'Junio C Hamano2008-11-127-27/+116
|\ \ \ \ \ \ \
| * | | | | | | t7700: test that 'repack -a' packs alternate packed objectsBrandon Casey2008-11-121-0/+16
View Lorry Controller Status