summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-16 03:01:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-16 03:01:44 -0700
commit47d45a5ebd5bce543a50546d05e8b92c6971acda (patch)
tree9b386fabbcb80dd7993e94a3c189ed21b9b03147 /notes-merge.c
parentgit-svn: Allow certain refs to be ignored (diff)
parentgit-gui: incremental goto line in blame view (diff)
downloadtgif-47d45a5ebd5bce543a50546d05e8b92c6971acda.tar.xz
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: incremental goto line in blame view git-gui: clear the goto line input when hiding git-gui: only accept numbers in the goto-line input git-gui: search and linenumber input are mutual exclusive in the blame view git-gui: deal with unknown files when pressing the "Stage Changed" button git-gui: drop the 'n' and 'Shift-n' bindings from the last patch. git-gui: Add keyboard shortcuts for search and goto commands in blame view. git-gui: Enable jumping to a specific line number in blame view. Fix tooltip display with multiple monitors on windows. Fix typo: existant->existent git-gui: updated translator README for current procedures. git-gui: warn when trying to commit on a detached head git-gui: Corrected a typo in the Swedish translation of 'Continue'
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions