From: Frank Brehm Date: Wed, 19 Apr 2017 21:50:38 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=a581567c08889d6438e7267e9fb50f76ebb63c2a;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/tigrc b/tigrc index bb098f46..f52212a6 100644 --- a/tigrc +++ b/tigrc @@ -21,8 +21,11 @@ # - overflow (boolint) : Highlight overflows? Defaults to 50 when enabled. # # date -# - display (enum) [no|default|local|relative|short] +# - display (enum) [no|default|relative|relative-compact|custom] # : Show dates? +# - local (bool) : Show local dates? +# - format (string) : Custom strftime(3) format +# # file-name # - display (enum) [no|always|auto] : Show file names? # @@ -92,14 +95,18 @@ set ignore-space = no # Enum: no, all, some, at-eol (diff) set show-notes = yes # When non-bool passed as `--show-notes=...` (diff) #set diff-context = 3 # Number of lines to show around diff changes (diff) #set diff-options = -C # User-defined options for `tig show` (git-diff) +#set diff-highlight = true # String (or bool): Path to diff-highlight script, + # defaults to `diff-highlight`. #set blame-options = -C -C -C # User-defined options for `tig blame` (git-blame) #set log-options = --pretty=raw # User-defined options for `tig log` (git-log) #set main-options = -n 1000 # User-defined options for `tig` (git-log) +#set mailmap = yes # Use .mailmap to show canonical name and email address # Misc set refresh-mode = auto # Enum: manual, auto, after-command, periodic set refresh-interval = 10 # Interval in seconds between refreshes set ignore-case = no # Ignore case when searching? +set wrap-search = yes # Wrap around to top/bottom of view when searching set focus-child = yes # Move focus to child view when opened? set horizontal-scroll = 50% # Number of columns to scroll as % of width set split-view-height = 67% # Height of the bottom view for horizontal splits @@ -148,6 +155,7 @@ set mouse-scroll = 3 # Number of lines to scroll via the mouse bind main C ?git cherry-pick %(commit) bind status C !git commit +bind stash A ?git stash apply %(stash) bind stash P ?git stash pop %(stash) bind stash ! ?git stash drop %(stash) bind refs C ?git checkout %(branch) @@ -210,13 +218,11 @@ bind main F :toggle commit-title-refs # Toggle reference display (tags/branches # Cursor navigation bind generic j move-down bind generic k move-up -#bind generic ? move-half-page-down -#bind generic ? move-half-page-up +bind generic move-half-page-down +bind generic move-half-page-up bind generic move-page-down -bind generic move-page-down bind generic move-page-down bind generic move-page-up -bind generic move-page-up bind generic - move-page-up bind generic move-first-line bind generic move-last-line @@ -294,6 +300,7 @@ bind generic v show-version # Show Tig version # Note the four leading spaces in the string to match. This is because # Git automatically indents commit messages by four spaces. +color "---" blue default color "diff --" yellow default color "--- " yellow default color "+++ " yellow default @@ -381,6 +388,7 @@ color palette-11 default default bold color palette-12 white default bold color palette-13 red default bold color graph-commit blue default +color search-result black yellow # Mappings for colors read from git configuration. # Set to "no" to disable.