Commit 9d8c1b07 authored by nimrod's avatar nimrod
Browse files

Sort the git config.

parent 5503ad22

.config/git/config

+7 −7
Original line number Diff line number Diff line
@@ -5,17 +5,18 @@ 
    whitespace = fix



[alias]

    exec = "!${SHELL:-/bin/sh} -ic "

    Pull = pull --progress --ff --tags

    amend = commit --amend

    autorebase = -c 'core.editor=true' rebase -i --autosquash --autostash

    bull = submodule update --remote --init

    cdif = diff --cached --color-words

    cdiff = diff --cached

    cleaan = clean -dX

    cleaaan = clean -dx

    cleaan = clean -dX

    default-branch = name-rev --name-only origin/HEAD

    dif = diff --color-words --ignore-all-space

    empty-commit = commit --allow-empty

	exec = "!${SHELL:-/bin/sh} -ic "

    ff = merge --no-edit --ff-only

    fixup = !cd "${GIT_PREFIX:-$PWD}" && git commit --fixup $(git last-commit)

    forget = reset HEAD^
@@ -25,7 +26,6 @@ 
    pop = stash pop

    posh = push --set-upstream origin HEAD

    pre-commit = ! pre-commit run --files $(git uncommitted)

    Pull = pull --progress --ff --tags

    pull-force = !git fetch && git reset --hard "$(git tracking)"

    pushes = !git remote | xargs -n1 git push

    retry = !cd "${GIT_PREFIX:-$PWD}" && git amend --no-edit . && git shove
@@ -35,8 +35,8 @@ 
    serve-http = !git update-server-info && cd .git && python -m http.server 8080

    shove = push --force-with-lease

    squash = !cd "${GIT_PREFIX:-$PWD}" && git commit --squash $(git last-commit)

    staash = stash push --include-untracked

    staaash = stash push --all --include-untracked

    staash = stash push --include-untracked

    stat = status --short --branch

    tag-version = !git tag --annotate --force --message "v$(cat VERSION)" "v$(cat VERSION)"

    temptree = !git worktree prune && git worktree add "$(mktemp -d)"
@@ -73,15 +73,15 @@ 
    defaultBranch = master



[merge]

    tool = meld

    ff = false

    tool = meld



[notes]

    rewriteRef = refs/notes/commits



[push]

    followTags = true

    default = simple

    followTags = true



[rebase]

    autoSquash = true
@@ -99,6 +99,6 @@ 
	pushInsteadOf = "https://github.com/"



[user]

	name = Adar Nimrod

	email = nimrod@shore.co.il

	name = Adar Nimrod

	signingKey = A322378C61339ECD