aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* mergetool: Don't keep temporary merge files unless told toCharles Bailey2008-12-12
* mergetool: Add prompt to continue after failing to merge a fileCharles Bailey2008-12-12
* Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-14
* Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey2008-11-14
* Merge git://git.bogomips.org/git-svnJunio C Hamano2008-11-13
|\
| * git-svn: proper detection of bare repositoriesDeskin Miller2008-11-06
| * git-svn: respect i18n.commitencoding configEric Wong2008-11-06
| * git-svn: don't escape tilde ('~') for http(s) URLsEric Wong2008-11-06
* | Merge branch 'maint'Junio C Hamano2008-11-13
|\ \
| * | date/time: do not get confused by fractional secondsLinus Torvalds2008-11-13
* | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-11-13
|\ \ \
| * | | gitk: Fix linehtag undefined error with file highlightingPaul Mackerras2008-11-13
| * | | gitk: Fix commit encoding supportAlexander Gavrilov2008-11-13
| * | | gitk: Fix transient windows on Win32 and MacOSAlexander Gavrilov2008-11-13
| * | | gitk: Add accelerators to frequently used menu commandsAlexander Gavrilov2008-11-13
| * | | Merge branch 'dev'Paul Mackerras2008-11-09
| |\ \ \
| | * | | gitk: Cope with unmerged files in local changesPaul Mackerras2008-11-04
| | * | | gitk: Make "show origin of this line" work on fake commitsPaul Mackerras2008-11-04
| | * | | gitk: Unify handling of merge diffs with normal 2-way diffsPaul Mackerras2008-11-02
| * | | | gitk: Implement a user-friendly Edit View dialogAlexander Gavrilov2008-11-08
| * | | | gitk: Improve cherry-pick error handlingPaul Mackerras2008-11-08
| * | | | gitk: Make cherry-pick call git-citool on conflictsAlexander Gavrilov2008-11-07
| * | | | gitk: Make gitk dialog windows transientAlexander Gavrilov2008-11-07
| * | | | gitk: Add Return and Escape bindings to dialogsAlexander Gavrilov2008-11-07
| |/ / /
| * | | gitk: Make the background color of marked lines configurablePaul Mackerras2008-10-27
| * | | gitk: Add a menu item to show where a given line comes fromPaul Mackerras2008-10-27
| * | | gitk: Fix some off-by-one errors in computing which line to blamePaul Mackerras2008-10-27
| * | | gitk: Allow starting gui blame for a specific lineAlexander Gavrilov2008-10-26
| * | | gitk: Fix file list context menu for merge commitsAlexander Gavrilov2008-10-21
| * | | gitk: Allow forcing branch creation if it already existsAlexander Gavrilov2008-10-21
* | | | Update draft release notes to 1.6.1Junio C Hamano2008-11-12
* | | | Merge branch 'jn/gitweb-customlinks'Junio C Hamano2008-11-12
|\ \ \ \
| * | | | gitweb: Better processing format string in custom links in navbarJakub Narebski2008-10-12
* | | | | Merge branch 'gb/gitweb-snapshot-pathinfo'Junio C Hamano2008-11-12
|\ \ \ \ \
| * | | | | gitweb: embed snapshot format parameter in PATH_INFOGiuseppe Bilotta2008-11-02
| * | | | | gitweb: retrieve snapshot format from PATH_INFOGiuseppe Bilotta2008-11-02
| * | | | | gitweb: make the supported snapshot formats array globalGiuseppe Bilotta2008-11-02
* | | | | | Merge branch 'ds/uintmax-config' (early part)Junio C Hamano2008-11-12
|\ \ \ \ \ \
| * | | | | | Add autoconf tests for pthreadsDavid M. Syzdek2008-11-09
| * | | | | | Make Pthread link flags configurableDavid M. Syzdek2008-11-02
| * | | | | | Add Makefile check for FreeBSD 4.9-SECURITYDavid M. Syzdek2008-11-02
| * | | | | | Build: add NO_UINTMAX_T to support ancient systemsDavid M. Syzdek2008-11-02
* | | | | | | Merge branch 'jk/maint-commit-v-strip'Junio C Hamano2008-11-12
|\ \ \ \ \ \ \
| * | | | | | | commit: Fix stripping of patch in verbose mode.Jeff King2008-11-12
* | | | | | | | Merge branch 'np/pack-safer'Junio C Hamano2008-11-12
|\ \ \ \ \ \ \ \
| * | | | | | | | t5303: fix printf format string for portabilityJunio C Hamano2008-11-09
| * | | | | | | | t5303: work around printf breakage in dashJunio C Hamano2008-11-09
| * | | | | | | | pack-objects: don't leak pack window reference when splitting packsNicolas Pitre2008-11-02
| * | | | | | | | extend test coverage for latest pack corruption resilience improvementsNicolas Pitre2008-11-02
| * | | | | | | | pack-objects: allow "fixing" a corrupted pack without a full repackNicolas Pitre2008-11-02