diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-16 03:46:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-16 03:46:51 -0700 |
| commit | 1d7d6ad539fabd49421d8ef7b27c0f287430bc7d (patch) | |
| tree | 391b1210aaf0283f1bf69a7d4ae117b0829f0741 /builtin-merge.c | |
| parent | git-cvsimport: add support for cvs pserver password scrambling. (diff) | |
| parent | gitk: Parse arbitrary commit-ish in SHA1 field (diff) | |
| download | git-1d7d6ad539fabd49421d8ef7b27c0f287430bc7d.tar.gz git-1d7d6ad539fabd49421d8ef7b27c0f287430bc7d.zip | |
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Parse arbitrary commit-ish in SHA1 field
gitk: Fix direction of symmetric difference in optimized mode
gitk: New option to hide remote refs
gitk: Do not hard-code "encoding" in attribute lookup functions
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions