diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-16 22:18:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-16 22:18:42 -0800 |
| commit | 09bb4eb4f14c0b92baa649b2b97cda2390b84b84 (patch) | |
| tree | b46d14c6c15058b56702009ccd89c7c7a7a7c10b /resolve-undo.c | |
| parent | 10f4eb652ee4e592f91f638e579d1afcb96c0408 (diff) | |
| parent | 811c70fc8369cfeae2f1e843c695c37e3b0c3109 (diff) | |
| download | git-09bb4eb4f14c0b92baa649b2b97cda2390b84b84.tar.gz | |
Merge git://ozlabs.org/~paulus/gitk
* git://ozlabs.org/~paulus/gitk:
gitk: Make vi-style keybindings more vi-like
gitk: Make "touching paths" search support backslashes
gitk: Show modified files with separate work tree
gitk: Simplify calculation of gitdir
gitk: Run 'git rev-parse --git-dir' only once
gitk: Put temporary directory inside .git
gitk: Fix "External diff" with separate work tree
gitk: Fix "blame parent commit" with separate work tree
gitk: Fix "show origin of this line" with separate work tree
gitk: Fix file highlight when run in subdirectory
gitk: Update copyright
gitk: When a commit contains a note, mark it with a yellow box
gitk: Remember time zones from author and commit timestamps
gitk: Remove unused $cdate array
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions