diff options
| author | Robert Günzler <r@gnzler.io> | 2020-04-10 14:13:57 +0200 |
|---|---|---|
| committer | Robert Günzler <r@gnzler.io> | 2020-04-10 14:13:57 +0200 |
| commit | ffda6911a152959f99ea0058e0c14c6ea87f46ec (patch) | |
| tree | 4f291d93bf249ce7f24a99fe7bbad84ea4020c24 | |
| parent | e9c0d049e07c1b92c16ded58156c2b2dd0bf0f22 (diff) | |
git: misc stuff
* default to rebase on pull * add amend alias * add fuzzy branch using fzfez
| -rw-r--r-- | .config/git/config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config index afc72bb..09c5372 100644 --- a/.config/git/config +++ b/.config/git/config @@ -79,6 +79,8 @@ rebase-onto = !bash -c 'git rebase --onto ${1} `git oldest-ancestor ${2} ${3}` ${3}' - find-by-subject = "!f() { set -ex; s=`git log -1 --format=%s ${1}`; git --no-pager log -1 --grep=\"^${s}$\" --no-merges ${2}; }; f" tig = !tig + amend = commit --amend + fbr = !fzfez git-branches [apply] @@ -117,6 +119,9 @@ [fetch] prune = true +[pull] + rebase = true + [grep] lineNumber = true |