From 3c73cb4f5da7b5cef2e7d2ab5d1f7bd184eb79bc Mon Sep 17 00:00:00 2001 From: Joel Parker Henderson Date: Thu, 26 Aug 2021 21:31:57 -0400 Subject: [PATCH 1/2] Fix wording --- gitalias.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitalias.txt b/gitalias.txt index e9663384..962f8bed 100644 --- a/gitalias.txt +++ b/gitalias.txt @@ -1377,8 +1377,8 @@ # # This command takes a long time to run, perhaps even overnight. # - # Currently, this command simply calls `git pruner` and `git repacker`. - # There's a step that may be unnecessarying, calling `git prune-packer`. + # Currently, this command simply calls `git pruner` and `git repacker`, + # then one step (that may be unnecessary) calling `git prune-packed`. # optimizer = !git pruner; git repacker; git prune-packed From e26b10dcb1279373b497bb8f60209bbc8b482d78 Mon Sep 17 00:00:00 2001 From: Joel Parker Henderson Date: Fri, 15 Oct 2021 19:31:46 +0200 Subject: [PATCH 2/2] Add doc --- doc/_index.md | 6 - doc/alias/_index/index.md | 6 - doc/alias/index.md | 353 ------------------ doc/contribute/contribute.md | 1 - doc/customize/customize.md | 1 - doc/examples/examples.md | 1 - doc/{alias => }/git-a/index.md | 0 doc/{alias => }/git-aa/index.md | 0 doc/{alias => }/git-add-alias/index.md | 0 doc/{alias => }/git-add/index.md | 0 doc/{alias => }/git-aliases/index.md | 0 doc/{alias => }/git-ap/index.md | 0 doc/{alias => }/git-archive/index.md | 0 .../git-assume-git-unassume/index.md | 0 doc/{alias => }/git-au/index.md | 0 doc/{alias => }/git-b/index.md | 0 doc/{alias => }/git-bed/index.md | 0 doc/{alias => }/git-bm/index.md | 0 doc/{alias => }/git-bnm/index.md | 0 doc/{alias => }/git-branch-name/index.md | 0 doc/{alias => }/git-branches/index.md | 0 doc/{alias => }/git-bsd/index.md | 0 doc/{alias => }/git-c/index.md | 0 doc/{alias => }/git-ca/index.md | 0 doc/{alias => }/git-cam/index.md | 0 doc/{alias => }/git-cane/index.md | 0 doc/{alias => }/git-chart/index.md | 0 .../git-cherry-pick-merge/index.md | 0 doc/{alias => }/git-churn/index.md | 0 doc/{alias => }/git-ci/index.md | 0 doc/{alias => }/git-cleaner/index.md | 0 doc/{alias => }/git-cleanout/index.md | 0 doc/{alias => }/git-clone-lean/index.md | 0 doc/{alias => }/git-cloner/index.md | 0 doc/{alias => }/git-cm/index.md | 0 doc/{alias => }/git-co/index.md | 0 doc/{alias => }/git-cog/index.md | 0 doc/{alias => }/git-commit-is-merge/index.md | 0 .../git-commit-message-key-lines/index.md | 0 doc/{alias => }/git-commit-parents/index.md | 0 doc/{alias => }/git-cong/index.md | 0 doc/{alias => }/git-cp/index.md | 0 doc/{alias => }/git-cpa/index.md | 0 doc/{alias => }/git-cpc/index.md | 0 doc/{alias => }/git-cpn/index.md | 0 doc/{alias => }/git-cpnx/index.md | 0 doc/{alias => }/git-cull-locals/index.md | 0 doc/{alias => }/git-cull-remotes/index.md | 0 doc/{alias => }/git-cvs/index.md | 0 doc/{alias => }/git-d/index.md | 0 doc/{alias => }/git-dc/index.md | 0 doc/{alias => }/git-dd/index.md | 0 doc/{alias => }/git-debug/index.md | 0 doc/{alias => }/git-default-branch/index.md | 0 doc/{alias => }/git-diff-chunk/index.md | 0 doc/{alias => }/git-diff/index.md | 0 doc/{alias => }/git-ds/index.md | 0 doc/{alias => }/git-dwd/index.md | 0 doc/{alias => }/git-edit/index.md | 0 doc/{alias => }/git-exec/index.md | 0 doc/{alias => }/git-expunge/index.md | 0 doc/{alias => }/git-f/index.md | 0 doc/{alias => }/git-fixup/index.md | 0 doc/{alias => }/git-g/index.md | 0 doc/{alias => }/git-get-git-put/index.md | 0 doc/{alias => }/git-gg/index.md | 0 doc/{alias => }/git-gitk-conflict/index.md | 0 doc/{alias => }/git-gitk-history-all/index.md | 0 doc/{alias => }/git-gn/index.md | 0 doc/{alias => }/git-graphviz/index.md | 0 doc/{alias => }/git-grep/index.md | 0 doc/{alias => }/git-inbound/index.md | 0 doc/{alias => }/git-initer/index.md | 0 doc/{alias => }/git-intercommit/index.md | 0 doc/{alias => }/git-issues/index.md | 0 doc/{alias => }/git-l/index.md | 0 doc/{alias => }/git-last-tag/index.md | 0 doc/{alias => }/git-lfp/index.md | 0 doc/{alias => }/git-lg/index.md | 0 doc/{alias => }/git-ll/index.md | 0 doc/{alias => }/git-lll/index.md | 0 doc/{alias => }/git-lo/index.md | 0 doc/{alias => }/git-log/index.md | 0 doc/{alias => }/git-lp/index.md | 0 doc/{alias => }/git-ls/index.md | 0 doc/{alias => }/git-lsd/index.md | 0 doc/{alias => }/git-lsfn/index.md | 0 doc/{alias => }/git-lsio/index.md | 0 doc/{alias => }/git-lto/index.md | 0 doc/{alias => }/git-m/index.md | 0 doc/{alias => }/git-ma/index.md | 0 doc/{alias => }/git-mc/index.md | 0 doc/{alias => }/git-merge-safe/index.md | 0 doc/{alias => }/git-merge-span/index.md | 0 doc/{alias => }/git-move-alias/index.md | 0 doc/{alias => }/git-o/index.md | 0 doc/{alias => }/git-optimizer/index.md | 0 doc/{alias => }/git-orphans/index.md | 0 doc/{alias => }/git-ours-git-theirs/index.md | 0 doc/{alias => }/git-outbound/index.md | 0 doc/{alias => }/git-p/index.md | 0 doc/{alias => }/git-panic/index.md | 0 doc/{alias => }/git-pf/index.md | 0 doc/{alias => }/git-pp/index.md | 0 doc/{alias => }/git-pr/index.md | 0 doc/{alias => }/git-pruner/index.md | 0 .../git-publish-git-unpublish/index.md | 0 doc/{alias => }/git-pull1/index.md | 0 doc/{alias => }/git-push1/index.md | 0 doc/{alias => }/git-r/index.md | 0 doc/{alias => }/git-rb/index.md | 0 doc/{alias => }/git-rba/index.md | 0 doc/{alias => }/git-rbc/index.md | 0 doc/{alias => }/git-rbi/index.md | 0 doc/{alias => }/git-rbiu/index.md | 0 doc/{alias => }/git-rbs/index.md | 0 .../git-rebase-interactive-branch/index.md | 0 doc/{alias => }/git-refs-by-date/index.md | 0 doc/{alias => }/git-reincarnate/index.md | 0 doc/{alias => }/git-remotes-prune/index.md | 0 doc/{alias => }/git-remotes-push/index.md | 0 doc/{alias => }/git-repacker/index.md | 0 doc/{alias => }/git-reset/index.md | 0 .../index.md | 0 .../git-rev-list-all-objects-by-size/index.md | 0 doc/{alias => }/git-rl/index.md | 0 doc/{alias => }/git-rr/index.md | 0 doc/{alias => }/git-rrp/index.md | 0 doc/{alias => }/git-rrs/index.md | 0 doc/{alias => }/git-rru/index.md | 0 doc/{alias => }/git-rv/index.md | 0 doc/{alias => }/git-rvnc/index.md | 0 doc/{alias => }/git-s/index.md | 0 doc/{alias => }/git-sb/index.md | 0 doc/{alias => }/git-sbdo/index.md | 0 doc/{alias => }/git-sbto/index.md | 0 doc/{alias => }/git-search-commits/index.md | 0 doc/{alias => }/git-serve/index.md | 0 doc/{alias => }/git-sm/index.md | 0 doc/{alias => }/git-sma/index.md | 0 doc/{alias => }/git-smi/index.md | 0 doc/{alias => }/git-sms/index.md | 0 doc/{alias => }/git-smu/index.md | 0 doc/{alias => }/git-smui/index.md | 0 doc/{alias => }/git-smuir/index.md | 0 doc/{alias => }/git-snapshot/index.md | 0 doc/{alias => }/git-ss/index.md | 0 doc/{alias => }/git-ssb/index.md | 0 doc/{alias => }/git-stashes/index.md | 0 doc/{alias => }/git-summary/index.md | 0 doc/{alias => }/git-svn/index.md | 0 doc/{alias => }/git-tags/index.md | 0 doc/{alias/TODO/index.md => git-todo-wip.md} | 0 doc/{alias => }/git-top-name/index.md | 0 .../index.md | 10 +- doc/{alias => }/git-topic-move/index.md | 0 doc/{alias => }/git-topic-start/index.md | 2 +- doc/{alias => }/git-topic-stop/index.md | 2 +- doc/{alias => }/git-topic-sync/index.md | 2 +- doc/{alias => }/git-topic/index.md | 0 .../git-track-all-remote-branches/index.md | 0 .../git-track-git-untrack/index.md | 0 doc/{alias => }/git-unadd/index.md | 0 doc/{alias => }/git-uncommit/index.md | 0 doc/{alias => }/git-undo/index.md | 0 doc/{alias => }/git-untrack/index.md | 0 doc/{alias => }/git-upstream-branch/index.md | 0 doc/{alias => }/git-w/index.md | 0 doc/{alias => }/git-whatis/index.md | 0 doc/{alias => }/git-who/index.md | 0 doc/{alias => }/git-whois/index.md | 0 doc/{alias => }/git-wip-git-unwip/index.md | 0 doc/index.md | 351 +++++++++++++++++ doc/index/index.md | 6 - doc/install/install.md | 1 - doc/introduction/introduction.md | 1 - doc/more/more.md | 1 - doc/start.md | 351 +++++++++++++++++ doc/thanks/thanks.md | 1 - doc/todo/todo.md | 1 - 180 files changed, 710 insertions(+), 387 deletions(-) delete mode 100644 doc/_index.md delete mode 100644 doc/alias/_index/index.md delete mode 100644 doc/alias/index.md rename doc/{alias => }/git-a/index.md (100%) rename doc/{alias => }/git-aa/index.md (100%) rename doc/{alias => }/git-add-alias/index.md (100%) rename doc/{alias => }/git-add/index.md (100%) rename doc/{alias => }/git-aliases/index.md (100%) rename doc/{alias => }/git-ap/index.md (100%) rename doc/{alias => }/git-archive/index.md (100%) rename doc/{alias => }/git-assume-git-unassume/index.md (100%) rename doc/{alias => }/git-au/index.md (100%) rename doc/{alias => }/git-b/index.md (100%) rename doc/{alias => }/git-bed/index.md (100%) rename doc/{alias => }/git-bm/index.md (100%) rename doc/{alias => }/git-bnm/index.md (100%) rename doc/{alias => }/git-branch-name/index.md (100%) rename doc/{alias => }/git-branches/index.md (100%) rename doc/{alias => }/git-bsd/index.md (100%) rename doc/{alias => }/git-c/index.md (100%) rename doc/{alias => }/git-ca/index.md (100%) rename doc/{alias => }/git-cam/index.md (100%) rename doc/{alias => }/git-cane/index.md (100%) rename doc/{alias => }/git-chart/index.md (100%) rename doc/{alias => }/git-cherry-pick-merge/index.md (100%) rename doc/{alias => }/git-churn/index.md (100%) rename doc/{alias => }/git-ci/index.md (100%) rename doc/{alias => }/git-cleaner/index.md (100%) rename doc/{alias => }/git-cleanout/index.md (100%) rename doc/{alias => }/git-clone-lean/index.md (100%) rename doc/{alias => }/git-cloner/index.md (100%) rename doc/{alias => }/git-cm/index.md (100%) rename doc/{alias => }/git-co/index.md (100%) rename doc/{alias => }/git-cog/index.md (100%) rename doc/{alias => }/git-commit-is-merge/index.md (100%) rename doc/{alias => }/git-commit-message-key-lines/index.md (100%) rename doc/{alias => }/git-commit-parents/index.md (100%) rename doc/{alias => }/git-cong/index.md (100%) rename doc/{alias => }/git-cp/index.md (100%) rename doc/{alias => }/git-cpa/index.md (100%) rename doc/{alias => }/git-cpc/index.md (100%) rename doc/{alias => }/git-cpn/index.md (100%) rename doc/{alias => }/git-cpnx/index.md (100%) rename doc/{alias => }/git-cull-locals/index.md (100%) rename doc/{alias => }/git-cull-remotes/index.md (100%) rename doc/{alias => }/git-cvs/index.md (100%) rename doc/{alias => }/git-d/index.md (100%) rename doc/{alias => }/git-dc/index.md (100%) rename doc/{alias => }/git-dd/index.md (100%) rename doc/{alias => }/git-debug/index.md (100%) rename doc/{alias => }/git-default-branch/index.md (100%) rename doc/{alias => }/git-diff-chunk/index.md (100%) rename doc/{alias => }/git-diff/index.md (100%) rename doc/{alias => }/git-ds/index.md (100%) rename doc/{alias => }/git-dwd/index.md (100%) rename doc/{alias => }/git-edit/index.md (100%) rename doc/{alias => }/git-exec/index.md (100%) rename doc/{alias => }/git-expunge/index.md (100%) rename doc/{alias => }/git-f/index.md (100%) rename doc/{alias => }/git-fixup/index.md (100%) rename doc/{alias => }/git-g/index.md (100%) rename doc/{alias => }/git-get-git-put/index.md (100%) rename doc/{alias => }/git-gg/index.md (100%) rename doc/{alias => }/git-gitk-conflict/index.md (100%) rename doc/{alias => }/git-gitk-history-all/index.md (100%) rename doc/{alias => }/git-gn/index.md (100%) rename doc/{alias => }/git-graphviz/index.md (100%) rename doc/{alias => }/git-grep/index.md (100%) rename doc/{alias => }/git-inbound/index.md (100%) rename doc/{alias => }/git-initer/index.md (100%) rename doc/{alias => }/git-intercommit/index.md (100%) rename doc/{alias => }/git-issues/index.md (100%) rename doc/{alias => }/git-l/index.md (100%) rename doc/{alias => }/git-last-tag/index.md (100%) rename doc/{alias => }/git-lfp/index.md (100%) rename doc/{alias => }/git-lg/index.md (100%) rename doc/{alias => }/git-ll/index.md (100%) rename doc/{alias => }/git-lll/index.md (100%) rename doc/{alias => }/git-lo/index.md (100%) rename doc/{alias => }/git-log/index.md (100%) rename doc/{alias => }/git-lp/index.md (100%) rename doc/{alias => }/git-ls/index.md (100%) rename doc/{alias => }/git-lsd/index.md (100%) rename doc/{alias => }/git-lsfn/index.md (100%) rename doc/{alias => }/git-lsio/index.md (100%) rename doc/{alias => }/git-lto/index.md (100%) rename doc/{alias => }/git-m/index.md (100%) rename doc/{alias => }/git-ma/index.md (100%) rename doc/{alias => }/git-mc/index.md (100%) rename doc/{alias => }/git-merge-safe/index.md (100%) rename doc/{alias => }/git-merge-span/index.md (100%) rename doc/{alias => }/git-move-alias/index.md (100%) rename doc/{alias => }/git-o/index.md (100%) rename doc/{alias => }/git-optimizer/index.md (100%) rename doc/{alias => }/git-orphans/index.md (100%) rename doc/{alias => }/git-ours-git-theirs/index.md (100%) rename doc/{alias => }/git-outbound/index.md (100%) rename doc/{alias => }/git-p/index.md (100%) rename doc/{alias => }/git-panic/index.md (100%) rename doc/{alias => }/git-pf/index.md (100%) rename doc/{alias => }/git-pp/index.md (100%) rename doc/{alias => }/git-pr/index.md (100%) rename doc/{alias => }/git-pruner/index.md (100%) rename doc/{alias => }/git-publish-git-unpublish/index.md (100%) rename doc/{alias => }/git-pull1/index.md (100%) rename doc/{alias => }/git-push1/index.md (100%) rename doc/{alias => }/git-r/index.md (100%) rename doc/{alias => }/git-rb/index.md (100%) rename doc/{alias => }/git-rba/index.md (100%) rename doc/{alias => }/git-rbc/index.md (100%) rename doc/{alias => }/git-rbi/index.md (100%) rename doc/{alias => }/git-rbiu/index.md (100%) rename doc/{alias => }/git-rbs/index.md (100%) rename doc/{alias => }/git-rebase-interactive-branch/index.md (100%) rename doc/{alias => }/git-refs-by-date/index.md (100%) rename doc/{alias => }/git-reincarnate/index.md (100%) rename doc/{alias => }/git-remotes-prune/index.md (100%) rename doc/{alias => }/git-remotes-push/index.md (100%) rename doc/{alias => }/git-repacker/index.md (100%) rename doc/{alias => }/git-reset/index.md (100%) rename doc/{alias => }/git-rev-list-all-objects-by-size-and-name/index.md (100%) rename doc/{alias => }/git-rev-list-all-objects-by-size/index.md (100%) rename doc/{alias => }/git-rl/index.md (100%) rename doc/{alias => }/git-rr/index.md (100%) rename doc/{alias => }/git-rrp/index.md (100%) rename doc/{alias => }/git-rrs/index.md (100%) rename doc/{alias => }/git-rru/index.md (100%) rename doc/{alias => }/git-rv/index.md (100%) rename doc/{alias => }/git-rvnc/index.md (100%) rename doc/{alias => }/git-s/index.md (100%) rename doc/{alias => }/git-sb/index.md (100%) rename doc/{alias => }/git-sbdo/index.md (100%) rename doc/{alias => }/git-sbto/index.md (100%) rename doc/{alias => }/git-search-commits/index.md (100%) rename doc/{alias => }/git-serve/index.md (100%) rename doc/{alias => }/git-sm/index.md (100%) rename doc/{alias => }/git-sma/index.md (100%) rename doc/{alias => }/git-smi/index.md (100%) rename doc/{alias => }/git-sms/index.md (100%) rename doc/{alias => }/git-smu/index.md (100%) rename doc/{alias => }/git-smui/index.md (100%) rename doc/{alias => }/git-smuir/index.md (100%) rename doc/{alias => }/git-snapshot/index.md (100%) rename doc/{alias => }/git-ss/index.md (100%) rename doc/{alias => }/git-ssb/index.md (100%) rename doc/{alias => }/git-stashes/index.md (100%) rename doc/{alias => }/git-summary/index.md (100%) rename doc/{alias => }/git-svn/index.md (100%) rename doc/{alias => }/git-tags/index.md (100%) rename doc/{alias/TODO/index.md => git-todo-wip.md} (100%) rename doc/{alias => }/git-top-name/index.md (100%) rename doc/{alias/git-topic-branch => git-topic-base}/index.md (86%) rename doc/{alias => }/git-topic-move/index.md (100%) rename doc/{alias => }/git-topic-start/index.md (96%) rename doc/{alias => }/git-topic-stop/index.md (97%) rename doc/{alias => }/git-topic-sync/index.md (96%) rename doc/{alias => }/git-topic/index.md (100%) rename doc/{alias => }/git-track-all-remote-branches/index.md (100%) rename doc/{alias => }/git-track-git-untrack/index.md (100%) rename doc/{alias => }/git-unadd/index.md (100%) rename doc/{alias => }/git-uncommit/index.md (100%) rename doc/{alias => }/git-undo/index.md (100%) rename doc/{alias => }/git-untrack/index.md (100%) rename doc/{alias => }/git-upstream-branch/index.md (100%) rename doc/{alias => }/git-w/index.md (100%) rename doc/{alias => }/git-whatis/index.md (100%) rename doc/{alias => }/git-who/index.md (100%) rename doc/{alias => }/git-whois/index.md (100%) rename doc/{alias => }/git-wip-git-unwip/index.md (100%) create mode 100644 doc/index.md delete mode 100644 doc/index/index.md create mode 100644 doc/start.md diff --git a/doc/_index.md b/doc/_index.md deleted file mode 100644 index a42c2666..00000000 --- a/doc/_index.md +++ /dev/null @@ -1,6 +0,0 @@ -+++ -title = "Git Alias" -sort_by = "name" -template = "base.html" -page_template = "base.html" -+++ \ No newline at end of file diff --git a/doc/alias/_index/index.md b/doc/alias/_index/index.md deleted file mode 100644 index c8c8da6a..00000000 --- a/doc/alias/_index/index.md +++ /dev/null @@ -1,6 +0,0 @@ -+++ -title = "Git Alias list" -sort_by = "name" -template = "base.html" -page_template = "base.html" -+++ \ No newline at end of file diff --git a/doc/alias/index.md b/doc/alias/index.md deleted file mode 100644 index 11f4630c..00000000 --- a/doc/alias/index.md +++ /dev/null @@ -1,353 +0,0 @@ -+++ -+++ - -# Git Alias - -This project provides many git alias commands that you can use as you like. - -* [Introduction](introduction.md) -* [Install](install.md) -* [Examples](examples.md) -* [Customize](customize.md) - - -## One letter aliases - -One letter aliases are for our most-frequent commands: - -* [git a](git-a.md) = add -* [git b](git-b.md) = branch -* [git c](git-c.md) = commit -* [git d](git-d.md) = diff -* [git f](git-f.md) = fetch -* [git g](git-g.md) = grep -* [git l](git-l.md) = log -* [git m](git-m.md) = merge -* [git o](git-o.md) = checkout -* [git p](git-p.md) = pull -* [git s](git-s.md) = status -* [git w](git-w.md) = whatchanged - -One-letter aliases never use options, because we want -the aliases to be easy to compose and to be flexible. - - -## Short aliases for frequent commands - -Short aliases are for our very-frequent commands: - -git add: - -* [git a](git-a.md) = add -* [git aa](git-aa.md) = add --all -* [git ap](git-ap.md) = add --patch -* [git au](git-au.md) = add --update - -git branch: - -* [git b](git-bm.md) = branch -* [git bm](git-bm.md) = branch --merged -* [git bnm](git-bm.md) = branch --no-merged -* [git bed](git-bed.md) = branch --edit-description -* [git bsd](git-bsd.md) = branch --show-description (wishlist) - -git commit: - -* [git c](git-ca.md) = commit -* [git ca](git-ca.md) = commit --amend -* [git cam](git-cam.md) = commit --amend --message -* [git cane](git-cane.md) = commit --amend --no-edit -* [git ci](git-ci.md) = commit --interactive -* [git cm](git-ci.md) = commit --message - -git checkout: - -* [git co](git-co.md) = checkout -* [git cog](git-cog.md) = checkout --guess -* [git cong](git-cong.md) = checkout --no-guess - -git cherry-pick: - -* [git cp](git-cp.md) = cherry-pick -* [git cpa](git-cpa.md) = cherry-pick --abort -* [git cpc](git-cpc.md) = cherry-pick --continue -* [git cpn](git-cpn.md) = cherry-pick -n (--no-commit) -* [git cpnx](git-cpnx.md) = cherry-pick -n -x (--no-commit and with a message) - -git diff: - -* [git d](git-d.md) = diff -* [git dd](git-dd.md) = diff with our preferred settings -* [git dc](git-dc.md) = diff --cached -* [git ds](git-ds.md) = diff --staged -* [git dwd](git-ds.md) = diff --word-diff - -git grep: - -* [git g](git-g.md) = grep -* [git gg](git-gg.md) = grep with our preferred settings -* [git gn](git-gn.md) = grep -n (--line-number) - -git log: - -* [git l](git-l.md) = log -* [git ll](git-ll.md) = log with our preferred short settings -* [git lll](git-lll.md) = log with our preferred long settings -* [git lg](git-lg.md) = log --graph -* [git lo](git-lo.md) = log --oneline -* [git lp](git-lp.md) = log --patch -* [git lfp](git-lfp.md) = log --first-parent -* [git lto](git-lto.md) = log --topo-order - -git ls-files: - -* [git ls](git-ls.md) = ls-files -* [git lsd](git-lsd.md) = ls-files --debug -* [git lsfn](git-lsfn.md) = ls-files --full-name -* [git lsio](git-lsio.md) = ls-files --ignored --others --exclude-standard - -git merge: - -* [git m](git-m.md) = merge -* [git ma](git-ma.md) = merge --abort -* [git mc](git-mc.md) = merge --continue -* [git me](git-me.md) = merge --no-commit --no-ff - -git pull: - -* [git pf](git-pf.md) - git pull with fast-forward only -* [git pr](git-pr.md) - git pull with rebase -* [git pp](git-pp.md) - git pull with rebase preserve of merge commits - -git rebase: - -* [git rb](git-rb.md) = rebase -* [git rba](git-rb.md) = rebase --abort -* [git rbc](git-rbc.md) = rebase --continue -* [git rbs](git-rbs.md) = rebase --skip -* [git rbi](git-rbi.md) = rebase --interactive -* [git rbiu](git-rbiu.md) = rebase --interactive @{upstream} - -git reflog: - -* [git rl](git-rl.md) = reflog - -git remote: - -* [git rr](git-rr.md) = remote -* [git rrs](git-rrs.md) = remote show -* [git rru](git-rru.md) = remote update -* [git rrp](git-rrp.md) = remote prune - -git revert: - -* [git rv](git-rv.md) = revert -* [git rvnc](git-rvnc.md) = revert --no-commit - -git show-branch: - -* [git sb](git-sb.md) = show-branch -* [git sbdo](git-sbdo.md) = show-branch --date-order -* [git sbto](git-sbto.md) = show-branch --topo-order - -git submodule: - -* [git sm](git-sm.md) = submodule -* [git smi](git-smi.md) = submodule init -* [git sma](git-sma.md) = submodule add -* [git sms](git-sms.md) = submodule sync -* [git smu](git-smu.md) = submodule update -* [git smui](git-smui.md) = submodule update --init -* [git smuir](git-smuir.md) = submodule update --init --recursive - -git status: - -* [git s](git-s.md) = status -* [git ss](git-ss.md) = status --short -* [git ssb](git-ssb.md) = status --short --branch - - -## Friendly aliases - -Start: - -* [git initer](git-initer.md) - Initialize a repo with an empty rebaseable commit. -* [git cloner](git-cloner.md) - Clone a repo and recurse on any of its submodules. - -Branch names: - -* [git default-branch](git-default-branch.md) - Get the default branch name. -* [git current-branch](git-current-branch.md) - Get the current branch name. -* [git upstream-branch](git-upstream-branch.md) - Get the upstream branch name. -* [git topic-branch](git-topic-branch.md) - Get the topic branch name. - -List items: - -* [git aliases](git-aliases.md) - List aliases. -* [git branches](git-branches.md) - List branches. -* [git tags](git-tags.md) - List tags. -* [git stashes](git-stashes.md) - List stashes. - -Undo: - -* [git uncommit](git-uncommit.md) = reset --soft HEAD~1 -* [git unadd](git-unadd.md) = reset HEAD - - -## Convenience alaises - -Logging & reporting: - -* [git log](git-log.md) -* [git who](git-who.md) -* [git chart](git-chart.md) -* [git churn](git-churn.md) -* [git summary](git-summary.md) - -Lookups: - -* [git whois](git-whois.md) - Try to figure out an author's information. -* [git whatis](git-whatis.md) - Try to figure out an object's information. - -Commit details: - -* [git commit-parents](git-commit-parents.md) - Show the commit's parents. -* [git commit-is-merge](git-commit-is-merge.md) - Is the commit a merge commit? -* [git commit-message-key-lines](git-commit-message-key-lines.md) - -Add all & edit all: - -* [git add-*](git-edit.md) - Add all files of a given type. -* [git edit-*](git-edit.md) - Edit all files of a given type. - -Alias helpers: - -* [git add-alias](git-add-alias.md) - Create a new git alias. -* [git move-alias](git-move-alias.md) - Rename an existing git alias. - -Script helpers: - -* [git top-name](git-top-name.md) - Get the top level directory name. -* [git exec](git-exec.md) - Execute a shell script. - -Remotes: - -* [git remotes-prune](git-remotes-prune.md) - For each remote branch, prune it. -* [git remotes-push](git-remotes-push.md) - For each remote branch, push it. - -Misc: - -* [git diff-*](git-diff.md) -* [git grep-*](git-grep.md) -* [git merge-span-*](git-merge-span.md) -* [git orphans](git-orphans.md) -* [git fixup](git-fixup.md) -* [git rev-list-all-objects-by-size](git-rev-list-all-objects-by-size.md) -* [git rev-list-all-objects-by-size-and-name](git-rev-list-all-objects-by-size-and-name.md) -* [git cherry-pick-merge](git-cherry-pick-merge.md) -* [git refs-by-date](git-refs-by-date.md) - Sort by date for branches. - -Advanced aliases: - -* [git search-commits](git-search-commits.md) -* [git debug](git-debug.md) -* [git intercommit](git-intercommit.md) - - -## Workflow aliases - -Starting: - -* [git clone-lean](git-clone-lean.md) - -Save: - -* [git archive](git-archive.md) - Create an archive file of everything in the repo. -* [git snapshot](git-snapshot.md) - Stash a snapshot of your current working tree. -* [git panic](git-panic.md) - When you're worried the world is coming to an end. - -Flow aliases: - -* [git get & git put](git-get-git-put.md) -* [git ours & git theirs](git-ours-git-theirs.md) -* [git wip & git unwip](git-wip-git-unwip.md) -* [git assume & git unassume](git-assume-git-unassume.md) -* [git publish & git unpublish](git-publish-git-unpublish.md) - -reset & undo: - -* [git reset-*](git-reset.md) - Move backwards on the commit chain. -* [git undo-*](git-undo.md) - Move backwards on the commit chain. - -track & untrack: - -* [git track](git-track.md) - Start tracking from a local branch to upstream branch. -* [git untrack](git-untrack.md) - Stop tracking from a local branch to upstream branch. - -inbound & outbound: - -* [git inbound](git-inbound.md) - Show incoming changes compared to upstream. -* [git outbound](git-outbound.md) - Show outgoing changes compared to upstream. - -pull1 & push1: - -* [git pull1](git-pull1.md) - Pull just the current branch. -* [git push1](git-push1.md) - Push just the current branch. - -Topic branches: - -* [git topic-*](git-topic.md) - Read this first about topic branches. -* [git topic-branch](git-topic-branch.md) - Show the topic branch name. -* [git topic-start](git-topic-start.md) - Begin a topic branch. -* [git topic-stop](git-topic-stop.md) - End a topic branch. -* [git topic-sync](git-topic-sync.md) - Update a topic branch. -* [git topic-move](git-topic-move.md) - Rename a topic branch. - -Cull: - -* [git cull](git-cull-local.md) - Delete all branches that are merged. -* [git cull-locals](git-cull-local.md) - Delete local branches that are merged. -* [git cull-remotes](git-cull-remote.md) - Delete remote branches that are merged. - -Maintenance tuning: - -* [git cleaner](git-cleaner.md) - Clean the recommend way. -* [git pruner](git-pruner.md) - Prune the recommened way. -* [git repacker](git-repacker.md) - Repack the recommended way. -* [git optimizer](git-optimizer.md) - Optimize the recommended way. - -Misc: - -* [git issues](git-issues.md) - Show issues that are described in commit messages. -* [git expunge](git-expunge.md) - Use filter-branch to delete a file everywhere. -* [git reincarnate](git-reincarnate.md) - Kill a branch then create it anew. -* [git diff-chunk](git-diff-chunk.md) - Do a diff of two chunks in revisions. -* [git last-tag](git-last-tag.md) - Show the last tag in the current branch. -* [git serve](git-serve.md) - Serve the local directory via git server daemon. -* [git track-all-remote-branches](git-track-all-remote-branches.md) - Track all remote branches. -# [git cleanout](git-cleanout.md) - Clean and discard changes and untracked files in working tree. - - -## Tooling aliases - -Use gitk: - -* [git gitk-conflict](git-gitk-conflict.md) - Use gitk to show conflicting merge. -* [git gitk-history-all](git-history-all.md) - Use gitk to show full history. - -Use other version control systems: - -* [git cvs-*](git-cvs.md) - Use CVS version control. -* [git svn-*](git-svn.md) - Use Subversion version control. - -Use graphviz: - -* [git graphviz](git-graphviz.md) - Use graphviz for display. - - -## Epilog - -* [More information](more.html) -* [Contributing](contributing.md) -* [To do list](todo.html) -* [Thanks](thanks.html) diff --git a/doc/contribute/contribute.md b/doc/contribute/contribute.md index 11d40ab6..7324d25d 100644 --- a/doc/contribute/contribute.md +++ b/doc/contribute/contribute.md @@ -1,5 +1,4 @@ +++ -page_template = "base.html" +++ # Contribute diff --git a/doc/customize/customize.md b/doc/customize/customize.md index aa9a037d..ddb1303d 100644 --- a/doc/customize/customize.md +++ b/doc/customize/customize.md @@ -1,5 +1,4 @@ +++ -page_template = "base.html" +++ # Customize diff --git a/doc/examples/examples.md b/doc/examples/examples.md index abab9a47..718b8940 100644 --- a/doc/examples/examples.md +++ b/doc/examples/examples.md @@ -1,5 +1,4 @@ +++ -page_template = "base.html" +++ # Examples diff --git a/doc/alias/git-a/index.md b/doc/git-a/index.md similarity index 100% rename from doc/alias/git-a/index.md rename to doc/git-a/index.md diff --git a/doc/alias/git-aa/index.md b/doc/git-aa/index.md similarity index 100% rename from doc/alias/git-aa/index.md rename to doc/git-aa/index.md diff --git a/doc/alias/git-add-alias/index.md b/doc/git-add-alias/index.md similarity index 100% rename from doc/alias/git-add-alias/index.md rename to doc/git-add-alias/index.md diff --git a/doc/alias/git-add/index.md b/doc/git-add/index.md similarity index 100% rename from doc/alias/git-add/index.md rename to doc/git-add/index.md diff --git a/doc/alias/git-aliases/index.md b/doc/git-aliases/index.md similarity index 100% rename from doc/alias/git-aliases/index.md rename to doc/git-aliases/index.md diff --git a/doc/alias/git-ap/index.md b/doc/git-ap/index.md similarity index 100% rename from doc/alias/git-ap/index.md rename to doc/git-ap/index.md diff --git a/doc/alias/git-archive/index.md b/doc/git-archive/index.md similarity index 100% rename from doc/alias/git-archive/index.md rename to doc/git-archive/index.md diff --git a/doc/alias/git-assume-git-unassume/index.md b/doc/git-assume-git-unassume/index.md similarity index 100% rename from doc/alias/git-assume-git-unassume/index.md rename to doc/git-assume-git-unassume/index.md diff --git a/doc/alias/git-au/index.md b/doc/git-au/index.md similarity index 100% rename from doc/alias/git-au/index.md rename to doc/git-au/index.md diff --git a/doc/alias/git-b/index.md b/doc/git-b/index.md similarity index 100% rename from doc/alias/git-b/index.md rename to doc/git-b/index.md diff --git a/doc/alias/git-bed/index.md b/doc/git-bed/index.md similarity index 100% rename from doc/alias/git-bed/index.md rename to doc/git-bed/index.md diff --git a/doc/alias/git-bm/index.md b/doc/git-bm/index.md similarity index 100% rename from doc/alias/git-bm/index.md rename to doc/git-bm/index.md diff --git a/doc/alias/git-bnm/index.md b/doc/git-bnm/index.md similarity index 100% rename from doc/alias/git-bnm/index.md rename to doc/git-bnm/index.md diff --git a/doc/alias/git-branch-name/index.md b/doc/git-branch-name/index.md similarity index 100% rename from doc/alias/git-branch-name/index.md rename to doc/git-branch-name/index.md diff --git a/doc/alias/git-branches/index.md b/doc/git-branches/index.md similarity index 100% rename from doc/alias/git-branches/index.md rename to doc/git-branches/index.md diff --git a/doc/alias/git-bsd/index.md b/doc/git-bsd/index.md similarity index 100% rename from doc/alias/git-bsd/index.md rename to doc/git-bsd/index.md diff --git a/doc/alias/git-c/index.md b/doc/git-c/index.md similarity index 100% rename from doc/alias/git-c/index.md rename to doc/git-c/index.md diff --git a/doc/alias/git-ca/index.md b/doc/git-ca/index.md similarity index 100% rename from doc/alias/git-ca/index.md rename to doc/git-ca/index.md diff --git a/doc/alias/git-cam/index.md b/doc/git-cam/index.md similarity index 100% rename from doc/alias/git-cam/index.md rename to doc/git-cam/index.md diff --git a/doc/alias/git-cane/index.md b/doc/git-cane/index.md similarity index 100% rename from doc/alias/git-cane/index.md rename to doc/git-cane/index.md diff --git a/doc/alias/git-chart/index.md b/doc/git-chart/index.md similarity index 100% rename from doc/alias/git-chart/index.md rename to doc/git-chart/index.md diff --git a/doc/alias/git-cherry-pick-merge/index.md b/doc/git-cherry-pick-merge/index.md similarity index 100% rename from doc/alias/git-cherry-pick-merge/index.md rename to doc/git-cherry-pick-merge/index.md diff --git a/doc/alias/git-churn/index.md b/doc/git-churn/index.md similarity index 100% rename from doc/alias/git-churn/index.md rename to doc/git-churn/index.md diff --git a/doc/alias/git-ci/index.md b/doc/git-ci/index.md similarity index 100% rename from doc/alias/git-ci/index.md rename to doc/git-ci/index.md diff --git a/doc/alias/git-cleaner/index.md b/doc/git-cleaner/index.md similarity index 100% rename from doc/alias/git-cleaner/index.md rename to doc/git-cleaner/index.md diff --git a/doc/alias/git-cleanout/index.md b/doc/git-cleanout/index.md similarity index 100% rename from doc/alias/git-cleanout/index.md rename to doc/git-cleanout/index.md diff --git a/doc/alias/git-clone-lean/index.md b/doc/git-clone-lean/index.md similarity index 100% rename from doc/alias/git-clone-lean/index.md rename to doc/git-clone-lean/index.md diff --git a/doc/alias/git-cloner/index.md b/doc/git-cloner/index.md similarity index 100% rename from doc/alias/git-cloner/index.md rename to doc/git-cloner/index.md diff --git a/doc/alias/git-cm/index.md b/doc/git-cm/index.md similarity index 100% rename from doc/alias/git-cm/index.md rename to doc/git-cm/index.md diff --git a/doc/alias/git-co/index.md b/doc/git-co/index.md similarity index 100% rename from doc/alias/git-co/index.md rename to doc/git-co/index.md diff --git a/doc/alias/git-cog/index.md b/doc/git-cog/index.md similarity index 100% rename from doc/alias/git-cog/index.md rename to doc/git-cog/index.md diff --git a/doc/alias/git-commit-is-merge/index.md b/doc/git-commit-is-merge/index.md similarity index 100% rename from doc/alias/git-commit-is-merge/index.md rename to doc/git-commit-is-merge/index.md diff --git a/doc/alias/git-commit-message-key-lines/index.md b/doc/git-commit-message-key-lines/index.md similarity index 100% rename from doc/alias/git-commit-message-key-lines/index.md rename to doc/git-commit-message-key-lines/index.md diff --git a/doc/alias/git-commit-parents/index.md b/doc/git-commit-parents/index.md similarity index 100% rename from doc/alias/git-commit-parents/index.md rename to doc/git-commit-parents/index.md diff --git a/doc/alias/git-cong/index.md b/doc/git-cong/index.md similarity index 100% rename from doc/alias/git-cong/index.md rename to doc/git-cong/index.md diff --git a/doc/alias/git-cp/index.md b/doc/git-cp/index.md similarity index 100% rename from doc/alias/git-cp/index.md rename to doc/git-cp/index.md diff --git a/doc/alias/git-cpa/index.md b/doc/git-cpa/index.md similarity index 100% rename from doc/alias/git-cpa/index.md rename to doc/git-cpa/index.md diff --git a/doc/alias/git-cpc/index.md b/doc/git-cpc/index.md similarity index 100% rename from doc/alias/git-cpc/index.md rename to doc/git-cpc/index.md diff --git a/doc/alias/git-cpn/index.md b/doc/git-cpn/index.md similarity index 100% rename from doc/alias/git-cpn/index.md rename to doc/git-cpn/index.md diff --git a/doc/alias/git-cpnx/index.md b/doc/git-cpnx/index.md similarity index 100% rename from doc/alias/git-cpnx/index.md rename to doc/git-cpnx/index.md diff --git a/doc/alias/git-cull-locals/index.md b/doc/git-cull-locals/index.md similarity index 100% rename from doc/alias/git-cull-locals/index.md rename to doc/git-cull-locals/index.md diff --git a/doc/alias/git-cull-remotes/index.md b/doc/git-cull-remotes/index.md similarity index 100% rename from doc/alias/git-cull-remotes/index.md rename to doc/git-cull-remotes/index.md diff --git a/doc/alias/git-cvs/index.md b/doc/git-cvs/index.md similarity index 100% rename from doc/alias/git-cvs/index.md rename to doc/git-cvs/index.md diff --git a/doc/alias/git-d/index.md b/doc/git-d/index.md similarity index 100% rename from doc/alias/git-d/index.md rename to doc/git-d/index.md diff --git a/doc/alias/git-dc/index.md b/doc/git-dc/index.md similarity index 100% rename from doc/alias/git-dc/index.md rename to doc/git-dc/index.md diff --git a/doc/alias/git-dd/index.md b/doc/git-dd/index.md similarity index 100% rename from doc/alias/git-dd/index.md rename to doc/git-dd/index.md diff --git a/doc/alias/git-debug/index.md b/doc/git-debug/index.md similarity index 100% rename from doc/alias/git-debug/index.md rename to doc/git-debug/index.md diff --git a/doc/alias/git-default-branch/index.md b/doc/git-default-branch/index.md similarity index 100% rename from doc/alias/git-default-branch/index.md rename to doc/git-default-branch/index.md diff --git a/doc/alias/git-diff-chunk/index.md b/doc/git-diff-chunk/index.md similarity index 100% rename from doc/alias/git-diff-chunk/index.md rename to doc/git-diff-chunk/index.md diff --git a/doc/alias/git-diff/index.md b/doc/git-diff/index.md similarity index 100% rename from doc/alias/git-diff/index.md rename to doc/git-diff/index.md diff --git a/doc/alias/git-ds/index.md b/doc/git-ds/index.md similarity index 100% rename from doc/alias/git-ds/index.md rename to doc/git-ds/index.md diff --git a/doc/alias/git-dwd/index.md b/doc/git-dwd/index.md similarity index 100% rename from doc/alias/git-dwd/index.md rename to doc/git-dwd/index.md diff --git a/doc/alias/git-edit/index.md b/doc/git-edit/index.md similarity index 100% rename from doc/alias/git-edit/index.md rename to doc/git-edit/index.md diff --git a/doc/alias/git-exec/index.md b/doc/git-exec/index.md similarity index 100% rename from doc/alias/git-exec/index.md rename to doc/git-exec/index.md diff --git a/doc/alias/git-expunge/index.md b/doc/git-expunge/index.md similarity index 100% rename from doc/alias/git-expunge/index.md rename to doc/git-expunge/index.md diff --git a/doc/alias/git-f/index.md b/doc/git-f/index.md similarity index 100% rename from doc/alias/git-f/index.md rename to doc/git-f/index.md diff --git a/doc/alias/git-fixup/index.md b/doc/git-fixup/index.md similarity index 100% rename from doc/alias/git-fixup/index.md rename to doc/git-fixup/index.md diff --git a/doc/alias/git-g/index.md b/doc/git-g/index.md similarity index 100% rename from doc/alias/git-g/index.md rename to doc/git-g/index.md diff --git a/doc/alias/git-get-git-put/index.md b/doc/git-get-git-put/index.md similarity index 100% rename from doc/alias/git-get-git-put/index.md rename to doc/git-get-git-put/index.md diff --git a/doc/alias/git-gg/index.md b/doc/git-gg/index.md similarity index 100% rename from doc/alias/git-gg/index.md rename to doc/git-gg/index.md diff --git a/doc/alias/git-gitk-conflict/index.md b/doc/git-gitk-conflict/index.md similarity index 100% rename from doc/alias/git-gitk-conflict/index.md rename to doc/git-gitk-conflict/index.md diff --git a/doc/alias/git-gitk-history-all/index.md b/doc/git-gitk-history-all/index.md similarity index 100% rename from doc/alias/git-gitk-history-all/index.md rename to doc/git-gitk-history-all/index.md diff --git a/doc/alias/git-gn/index.md b/doc/git-gn/index.md similarity index 100% rename from doc/alias/git-gn/index.md rename to doc/git-gn/index.md diff --git a/doc/alias/git-graphviz/index.md b/doc/git-graphviz/index.md similarity index 100% rename from doc/alias/git-graphviz/index.md rename to doc/git-graphviz/index.md diff --git a/doc/alias/git-grep/index.md b/doc/git-grep/index.md similarity index 100% rename from doc/alias/git-grep/index.md rename to doc/git-grep/index.md diff --git a/doc/alias/git-inbound/index.md b/doc/git-inbound/index.md similarity index 100% rename from doc/alias/git-inbound/index.md rename to doc/git-inbound/index.md diff --git a/doc/alias/git-initer/index.md b/doc/git-initer/index.md similarity index 100% rename from doc/alias/git-initer/index.md rename to doc/git-initer/index.md diff --git a/doc/alias/git-intercommit/index.md b/doc/git-intercommit/index.md similarity index 100% rename from doc/alias/git-intercommit/index.md rename to doc/git-intercommit/index.md diff --git a/doc/alias/git-issues/index.md b/doc/git-issues/index.md similarity index 100% rename from doc/alias/git-issues/index.md rename to doc/git-issues/index.md diff --git a/doc/alias/git-l/index.md b/doc/git-l/index.md similarity index 100% rename from doc/alias/git-l/index.md rename to doc/git-l/index.md diff --git a/doc/alias/git-last-tag/index.md b/doc/git-last-tag/index.md similarity index 100% rename from doc/alias/git-last-tag/index.md rename to doc/git-last-tag/index.md diff --git a/doc/alias/git-lfp/index.md b/doc/git-lfp/index.md similarity index 100% rename from doc/alias/git-lfp/index.md rename to doc/git-lfp/index.md diff --git a/doc/alias/git-lg/index.md b/doc/git-lg/index.md similarity index 100% rename from doc/alias/git-lg/index.md rename to doc/git-lg/index.md diff --git a/doc/alias/git-ll/index.md b/doc/git-ll/index.md similarity index 100% rename from doc/alias/git-ll/index.md rename to doc/git-ll/index.md diff --git a/doc/alias/git-lll/index.md b/doc/git-lll/index.md similarity index 100% rename from doc/alias/git-lll/index.md rename to doc/git-lll/index.md diff --git a/doc/alias/git-lo/index.md b/doc/git-lo/index.md similarity index 100% rename from doc/alias/git-lo/index.md rename to doc/git-lo/index.md diff --git a/doc/alias/git-log/index.md b/doc/git-log/index.md similarity index 100% rename from doc/alias/git-log/index.md rename to doc/git-log/index.md diff --git a/doc/alias/git-lp/index.md b/doc/git-lp/index.md similarity index 100% rename from doc/alias/git-lp/index.md rename to doc/git-lp/index.md diff --git a/doc/alias/git-ls/index.md b/doc/git-ls/index.md similarity index 100% rename from doc/alias/git-ls/index.md rename to doc/git-ls/index.md diff --git a/doc/alias/git-lsd/index.md b/doc/git-lsd/index.md similarity index 100% rename from doc/alias/git-lsd/index.md rename to doc/git-lsd/index.md diff --git a/doc/alias/git-lsfn/index.md b/doc/git-lsfn/index.md similarity index 100% rename from doc/alias/git-lsfn/index.md rename to doc/git-lsfn/index.md diff --git a/doc/alias/git-lsio/index.md b/doc/git-lsio/index.md similarity index 100% rename from doc/alias/git-lsio/index.md rename to doc/git-lsio/index.md diff --git a/doc/alias/git-lto/index.md b/doc/git-lto/index.md similarity index 100% rename from doc/alias/git-lto/index.md rename to doc/git-lto/index.md diff --git a/doc/alias/git-m/index.md b/doc/git-m/index.md similarity index 100% rename from doc/alias/git-m/index.md rename to doc/git-m/index.md diff --git a/doc/alias/git-ma/index.md b/doc/git-ma/index.md similarity index 100% rename from doc/alias/git-ma/index.md rename to doc/git-ma/index.md diff --git a/doc/alias/git-mc/index.md b/doc/git-mc/index.md similarity index 100% rename from doc/alias/git-mc/index.md rename to doc/git-mc/index.md diff --git a/doc/alias/git-merge-safe/index.md b/doc/git-merge-safe/index.md similarity index 100% rename from doc/alias/git-merge-safe/index.md rename to doc/git-merge-safe/index.md diff --git a/doc/alias/git-merge-span/index.md b/doc/git-merge-span/index.md similarity index 100% rename from doc/alias/git-merge-span/index.md rename to doc/git-merge-span/index.md diff --git a/doc/alias/git-move-alias/index.md b/doc/git-move-alias/index.md similarity index 100% rename from doc/alias/git-move-alias/index.md rename to doc/git-move-alias/index.md diff --git a/doc/alias/git-o/index.md b/doc/git-o/index.md similarity index 100% rename from doc/alias/git-o/index.md rename to doc/git-o/index.md diff --git a/doc/alias/git-optimizer/index.md b/doc/git-optimizer/index.md similarity index 100% rename from doc/alias/git-optimizer/index.md rename to doc/git-optimizer/index.md diff --git a/doc/alias/git-orphans/index.md b/doc/git-orphans/index.md similarity index 100% rename from doc/alias/git-orphans/index.md rename to doc/git-orphans/index.md diff --git a/doc/alias/git-ours-git-theirs/index.md b/doc/git-ours-git-theirs/index.md similarity index 100% rename from doc/alias/git-ours-git-theirs/index.md rename to doc/git-ours-git-theirs/index.md diff --git a/doc/alias/git-outbound/index.md b/doc/git-outbound/index.md similarity index 100% rename from doc/alias/git-outbound/index.md rename to doc/git-outbound/index.md diff --git a/doc/alias/git-p/index.md b/doc/git-p/index.md similarity index 100% rename from doc/alias/git-p/index.md rename to doc/git-p/index.md diff --git a/doc/alias/git-panic/index.md b/doc/git-panic/index.md similarity index 100% rename from doc/alias/git-panic/index.md rename to doc/git-panic/index.md diff --git a/doc/alias/git-pf/index.md b/doc/git-pf/index.md similarity index 100% rename from doc/alias/git-pf/index.md rename to doc/git-pf/index.md diff --git a/doc/alias/git-pp/index.md b/doc/git-pp/index.md similarity index 100% rename from doc/alias/git-pp/index.md rename to doc/git-pp/index.md diff --git a/doc/alias/git-pr/index.md b/doc/git-pr/index.md similarity index 100% rename from doc/alias/git-pr/index.md rename to doc/git-pr/index.md diff --git a/doc/alias/git-pruner/index.md b/doc/git-pruner/index.md similarity index 100% rename from doc/alias/git-pruner/index.md rename to doc/git-pruner/index.md diff --git a/doc/alias/git-publish-git-unpublish/index.md b/doc/git-publish-git-unpublish/index.md similarity index 100% rename from doc/alias/git-publish-git-unpublish/index.md rename to doc/git-publish-git-unpublish/index.md diff --git a/doc/alias/git-pull1/index.md b/doc/git-pull1/index.md similarity index 100% rename from doc/alias/git-pull1/index.md rename to doc/git-pull1/index.md diff --git a/doc/alias/git-push1/index.md b/doc/git-push1/index.md similarity index 100% rename from doc/alias/git-push1/index.md rename to doc/git-push1/index.md diff --git a/doc/alias/git-r/index.md b/doc/git-r/index.md similarity index 100% rename from doc/alias/git-r/index.md rename to doc/git-r/index.md diff --git a/doc/alias/git-rb/index.md b/doc/git-rb/index.md similarity index 100% rename from doc/alias/git-rb/index.md rename to doc/git-rb/index.md diff --git a/doc/alias/git-rba/index.md b/doc/git-rba/index.md similarity index 100% rename from doc/alias/git-rba/index.md rename to doc/git-rba/index.md diff --git a/doc/alias/git-rbc/index.md b/doc/git-rbc/index.md similarity index 100% rename from doc/alias/git-rbc/index.md rename to doc/git-rbc/index.md diff --git a/doc/alias/git-rbi/index.md b/doc/git-rbi/index.md similarity index 100% rename from doc/alias/git-rbi/index.md rename to doc/git-rbi/index.md diff --git a/doc/alias/git-rbiu/index.md b/doc/git-rbiu/index.md similarity index 100% rename from doc/alias/git-rbiu/index.md rename to doc/git-rbiu/index.md diff --git a/doc/alias/git-rbs/index.md b/doc/git-rbs/index.md similarity index 100% rename from doc/alias/git-rbs/index.md rename to doc/git-rbs/index.md diff --git a/doc/alias/git-rebase-interactive-branch/index.md b/doc/git-rebase-interactive-branch/index.md similarity index 100% rename from doc/alias/git-rebase-interactive-branch/index.md rename to doc/git-rebase-interactive-branch/index.md diff --git a/doc/alias/git-refs-by-date/index.md b/doc/git-refs-by-date/index.md similarity index 100% rename from doc/alias/git-refs-by-date/index.md rename to doc/git-refs-by-date/index.md diff --git a/doc/alias/git-reincarnate/index.md b/doc/git-reincarnate/index.md similarity index 100% rename from doc/alias/git-reincarnate/index.md rename to doc/git-reincarnate/index.md diff --git a/doc/alias/git-remotes-prune/index.md b/doc/git-remotes-prune/index.md similarity index 100% rename from doc/alias/git-remotes-prune/index.md rename to doc/git-remotes-prune/index.md diff --git a/doc/alias/git-remotes-push/index.md b/doc/git-remotes-push/index.md similarity index 100% rename from doc/alias/git-remotes-push/index.md rename to doc/git-remotes-push/index.md diff --git a/doc/alias/git-repacker/index.md b/doc/git-repacker/index.md similarity index 100% rename from doc/alias/git-repacker/index.md rename to doc/git-repacker/index.md diff --git a/doc/alias/git-reset/index.md b/doc/git-reset/index.md similarity index 100% rename from doc/alias/git-reset/index.md rename to doc/git-reset/index.md diff --git a/doc/alias/git-rev-list-all-objects-by-size-and-name/index.md b/doc/git-rev-list-all-objects-by-size-and-name/index.md similarity index 100% rename from doc/alias/git-rev-list-all-objects-by-size-and-name/index.md rename to doc/git-rev-list-all-objects-by-size-and-name/index.md diff --git a/doc/alias/git-rev-list-all-objects-by-size/index.md b/doc/git-rev-list-all-objects-by-size/index.md similarity index 100% rename from doc/alias/git-rev-list-all-objects-by-size/index.md rename to doc/git-rev-list-all-objects-by-size/index.md diff --git a/doc/alias/git-rl/index.md b/doc/git-rl/index.md similarity index 100% rename from doc/alias/git-rl/index.md rename to doc/git-rl/index.md diff --git a/doc/alias/git-rr/index.md b/doc/git-rr/index.md similarity index 100% rename from doc/alias/git-rr/index.md rename to doc/git-rr/index.md diff --git a/doc/alias/git-rrp/index.md b/doc/git-rrp/index.md similarity index 100% rename from doc/alias/git-rrp/index.md rename to doc/git-rrp/index.md diff --git a/doc/alias/git-rrs/index.md b/doc/git-rrs/index.md similarity index 100% rename from doc/alias/git-rrs/index.md rename to doc/git-rrs/index.md diff --git a/doc/alias/git-rru/index.md b/doc/git-rru/index.md similarity index 100% rename from doc/alias/git-rru/index.md rename to doc/git-rru/index.md diff --git a/doc/alias/git-rv/index.md b/doc/git-rv/index.md similarity index 100% rename from doc/alias/git-rv/index.md rename to doc/git-rv/index.md diff --git a/doc/alias/git-rvnc/index.md b/doc/git-rvnc/index.md similarity index 100% rename from doc/alias/git-rvnc/index.md rename to doc/git-rvnc/index.md diff --git a/doc/alias/git-s/index.md b/doc/git-s/index.md similarity index 100% rename from doc/alias/git-s/index.md rename to doc/git-s/index.md diff --git a/doc/alias/git-sb/index.md b/doc/git-sb/index.md similarity index 100% rename from doc/alias/git-sb/index.md rename to doc/git-sb/index.md diff --git a/doc/alias/git-sbdo/index.md b/doc/git-sbdo/index.md similarity index 100% rename from doc/alias/git-sbdo/index.md rename to doc/git-sbdo/index.md diff --git a/doc/alias/git-sbto/index.md b/doc/git-sbto/index.md similarity index 100% rename from doc/alias/git-sbto/index.md rename to doc/git-sbto/index.md diff --git a/doc/alias/git-search-commits/index.md b/doc/git-search-commits/index.md similarity index 100% rename from doc/alias/git-search-commits/index.md rename to doc/git-search-commits/index.md diff --git a/doc/alias/git-serve/index.md b/doc/git-serve/index.md similarity index 100% rename from doc/alias/git-serve/index.md rename to doc/git-serve/index.md diff --git a/doc/alias/git-sm/index.md b/doc/git-sm/index.md similarity index 100% rename from doc/alias/git-sm/index.md rename to doc/git-sm/index.md diff --git a/doc/alias/git-sma/index.md b/doc/git-sma/index.md similarity index 100% rename from doc/alias/git-sma/index.md rename to doc/git-sma/index.md diff --git a/doc/alias/git-smi/index.md b/doc/git-smi/index.md similarity index 100% rename from doc/alias/git-smi/index.md rename to doc/git-smi/index.md diff --git a/doc/alias/git-sms/index.md b/doc/git-sms/index.md similarity index 100% rename from doc/alias/git-sms/index.md rename to doc/git-sms/index.md diff --git a/doc/alias/git-smu/index.md b/doc/git-smu/index.md similarity index 100% rename from doc/alias/git-smu/index.md rename to doc/git-smu/index.md diff --git a/doc/alias/git-smui/index.md b/doc/git-smui/index.md similarity index 100% rename from doc/alias/git-smui/index.md rename to doc/git-smui/index.md diff --git a/doc/alias/git-smuir/index.md b/doc/git-smuir/index.md similarity index 100% rename from doc/alias/git-smuir/index.md rename to doc/git-smuir/index.md diff --git a/doc/alias/git-snapshot/index.md b/doc/git-snapshot/index.md similarity index 100% rename from doc/alias/git-snapshot/index.md rename to doc/git-snapshot/index.md diff --git a/doc/alias/git-ss/index.md b/doc/git-ss/index.md similarity index 100% rename from doc/alias/git-ss/index.md rename to doc/git-ss/index.md diff --git a/doc/alias/git-ssb/index.md b/doc/git-ssb/index.md similarity index 100% rename from doc/alias/git-ssb/index.md rename to doc/git-ssb/index.md diff --git a/doc/alias/git-stashes/index.md b/doc/git-stashes/index.md similarity index 100% rename from doc/alias/git-stashes/index.md rename to doc/git-stashes/index.md diff --git a/doc/alias/git-summary/index.md b/doc/git-summary/index.md similarity index 100% rename from doc/alias/git-summary/index.md rename to doc/git-summary/index.md diff --git a/doc/alias/git-svn/index.md b/doc/git-svn/index.md similarity index 100% rename from doc/alias/git-svn/index.md rename to doc/git-svn/index.md diff --git a/doc/alias/git-tags/index.md b/doc/git-tags/index.md similarity index 100% rename from doc/alias/git-tags/index.md rename to doc/git-tags/index.md diff --git a/doc/alias/TODO/index.md b/doc/git-todo-wip.md similarity index 100% rename from doc/alias/TODO/index.md rename to doc/git-todo-wip.md diff --git a/doc/alias/git-top-name/index.md b/doc/git-top-name/index.md similarity index 100% rename from doc/alias/git-top-name/index.md rename to doc/git-top-name/index.md diff --git a/doc/alias/git-topic-branch/index.md b/doc/git-topic-base/index.md similarity index 86% rename from doc/alias/git-topic-branch/index.md rename to doc/git-topic-base/index.md index 96a39a3d..2f7ae748 100644 --- a/doc/alias/git-topic-branch/index.md +++ b/doc/git-topic-base/index.md @@ -1,10 +1,10 @@ +++ +++ -# git topic-branch +# git topic-base ```gitconfig -# git topic-branch - Show the topic branch name. +# git topic-base - Show the topic branch name. # # When we do topic branches, we use a base topic branch, # and use it to create new topic branches, and also use @@ -35,12 +35,12 @@ # # Examples: # -# $ git topic-branch +# $ git topic-base # main # # $ git config init.topicBranch "topic" -# $ git topic-branch +# $ git topic-base # topic # -topic-branch = "!git config --get init.topicBranch || git config --get init.defaultBranch" +topic-base = "!git config --get init.topicBranch || git config --get init.defaultBranch" ``` diff --git a/doc/alias/git-topic-move/index.md b/doc/git-topic-move/index.md similarity index 100% rename from doc/alias/git-topic-move/index.md rename to doc/git-topic-move/index.md diff --git a/doc/alias/git-topic-start/index.md b/doc/git-topic-start/index.md similarity index 96% rename from doc/alias/git-topic-start/index.md rename to doc/git-topic-start/index.md index 127bd6b4..40b8ef1e 100644 --- a/doc/alias/git-topic-start/index.md +++ b/doc/git-topic-start/index.md @@ -30,7 +30,7 @@ # topic-start = "!f(){ \ new_branch=\"$1\"; \ - old_branch=$(git topic-branch); \ + old_branch=$(git topic-base); \ git checkout \"$old_branch\"; git pull; \ git checkout -b \"$new_branch\" \"$old_branch\"; \ git push --set-upstream origin \"$new_branch\"; \ diff --git a/doc/alias/git-topic-stop/index.md b/doc/git-topic-stop/index.md similarity index 97% rename from doc/alias/git-topic-stop/index.md rename to doc/git-topic-stop/index.md index 1301a5af..d9161d59 100644 --- a/doc/alias/git-topic-stop/index.md +++ b/doc/git-topic-stop/index.md @@ -36,7 +36,7 @@ # topic-stop = "!f(){ \ new_branch=$(git current-branch); \ - old_branch=$(git topic-branch); \ + old_branch=$(git topic-base); \ if [ \"$new_branch\" = \"$old_branch\" ]; then \ printf \"You are asking to do git topic-stop,\n\"; \ printf \"but you are not on a new topic branch;\n\"; \ diff --git a/doc/alias/git-topic-sync/index.md b/doc/git-topic-sync/index.md similarity index 96% rename from doc/alias/git-topic-sync/index.md rename to doc/git-topic-sync/index.md index 31d1562f..8b9fcaea 100644 --- a/doc/alias/git-topic-sync/index.md +++ b/doc/git-topic-sync/index.md @@ -23,7 +23,7 @@ # topic-sync = "!f(){ \ new_branch=$(git current-branch); \ - old_branch=$(git topic-branch); \ + old_branch=$(git topic-base); \ if [ \"$new_branch\" = \"$old_branch\" ]; then \ printf \"You are asking to do git topic-sync,\n\"; \ printf \"but you are not on a new topic branch;\n\"; \ diff --git a/doc/alias/git-topic/index.md b/doc/git-topic/index.md similarity index 100% rename from doc/alias/git-topic/index.md rename to doc/git-topic/index.md diff --git a/doc/alias/git-track-all-remote-branches/index.md b/doc/git-track-all-remote-branches/index.md similarity index 100% rename from doc/alias/git-track-all-remote-branches/index.md rename to doc/git-track-all-remote-branches/index.md diff --git a/doc/alias/git-track-git-untrack/index.md b/doc/git-track-git-untrack/index.md similarity index 100% rename from doc/alias/git-track-git-untrack/index.md rename to doc/git-track-git-untrack/index.md diff --git a/doc/alias/git-unadd/index.md b/doc/git-unadd/index.md similarity index 100% rename from doc/alias/git-unadd/index.md rename to doc/git-unadd/index.md diff --git a/doc/alias/git-uncommit/index.md b/doc/git-uncommit/index.md similarity index 100% rename from doc/alias/git-uncommit/index.md rename to doc/git-uncommit/index.md diff --git a/doc/alias/git-undo/index.md b/doc/git-undo/index.md similarity index 100% rename from doc/alias/git-undo/index.md rename to doc/git-undo/index.md diff --git a/doc/alias/git-untrack/index.md b/doc/git-untrack/index.md similarity index 100% rename from doc/alias/git-untrack/index.md rename to doc/git-untrack/index.md diff --git a/doc/alias/git-upstream-branch/index.md b/doc/git-upstream-branch/index.md similarity index 100% rename from doc/alias/git-upstream-branch/index.md rename to doc/git-upstream-branch/index.md diff --git a/doc/alias/git-w/index.md b/doc/git-w/index.md similarity index 100% rename from doc/alias/git-w/index.md rename to doc/git-w/index.md diff --git a/doc/alias/git-whatis/index.md b/doc/git-whatis/index.md similarity index 100% rename from doc/alias/git-whatis/index.md rename to doc/git-whatis/index.md diff --git a/doc/alias/git-who/index.md b/doc/git-who/index.md similarity index 100% rename from doc/alias/git-who/index.md rename to doc/git-who/index.md diff --git a/doc/alias/git-whois/index.md b/doc/git-whois/index.md similarity index 100% rename from doc/alias/git-whois/index.md rename to doc/git-whois/index.md diff --git a/doc/alias/git-wip-git-unwip/index.md b/doc/git-wip-git-unwip/index.md similarity index 100% rename from doc/alias/git-wip-git-unwip/index.md rename to doc/git-wip-git-unwip/index.md diff --git a/doc/index.md b/doc/index.md new file mode 100644 index 00000000..52d9d43d --- /dev/null +++ b/doc/index.md @@ -0,0 +1,351 @@ ++++ ++++ + +# Git Alias + +This project provides many git alias commands that you can use as you like. + +* [Introduction](./introduction) +* [Install](./install) +* [Examples](./examples) +* [Customize](./customize) +* [Contributing](./contributing) +* [Thanks](./thanks.html) +* [To do](./todo.html) +* [More](./more.html) + + +## One letter aliases + +One letter aliases are for our most-frequent commands: + +* [git a](./git-a) = add +* [git b](./git-b) = branch +* [git c](./git-c) = commit +* [git d](./git-d) = diff +* [git f](./git-f) = fetch +* [git g](./git-g) = grep +* [git l](./git-l) = log +* [git m](./git-m) = merge +* [git o](./git-o) = checkout +* [git p](./git-p) = pull +* [git s](./git-s) = status +* [git w](./git-w) = whatchanged + +One-letter aliases never use options, because we want +the aliases to be easy to compose and to be flexible. + + +## Short aliases for frequent commands + +Short aliases are for our very-frequent commands: + +git add: + +* [git a](./git-a) = add +* [git aa](./git-aa) = add --all +* [git ap](./git-ap) = add --patch +* [git au](./git-au) = add --update + +git branch: + +* [git b](./git-bm) = branch +* [git bm](./git-bm) = branch --merged +* [git bnm](./git-bm) = branch --no-merged +* [git bed](./git-bed) = branch --edit-description +* [git bsd](./git-bsd) = branch --show-description (wishlist) + +git commit: + +* [git c](./git-ca) = commit +* [git ca](./git-ca) = commit --amend +* [git cam](./git-cam) = commit --amend --message +* [git cane](./git-cane) = commit --amend --no-edit +* [git ci](./git-ci) = commit --interactive +* [git cm](./git-ci) = commit --message + +git checkout: + +* [git co](./git-co) = checkout +* [git cog](./git-cog) = checkout --guess +* [git cong](./git-cong) = checkout --no-guess + +git cherry-pick: + +* [git cp](./git-cp) = cherry-pick +* [git cpa](./git-cpa) = cherry-pick --abort +* [git cpc](./git-cpc) = cherry-pick --continue +* [git cpn](./git-cpn) = cherry-pick -n (--no-commit) +* [git cpnx](./git-cpnx) = cherry-pick -n -x (--no-commit and with a message) + +git diff: + +* [git d](./git-d) = diff +* [git dd](./git-dd) = diff with our preferred settings +* [git dc](./git-dc) = diff --cached +* [git ds](./git-ds) = diff --staged +* [git dwd](./git-ds) = diff --word-diff + +git grep: + +* [git g](./git-g) = grep +* [git gg](./git-gg) = grep with our preferred settings +* [git gn](./git-gn) = grep -n (--line-number) + +git log: + +* [git l](./git-l) = log +* [git ll](./git-ll) = log with our preferred short settings +* [git lll](./git-lll) = log with our preferred long settings +* [git lg](./git-lg) = log --graph +* [git lo](./git-lo) = log --oneline +* [git lp](./git-lp) = log --patch +* [git lfp](./git-lfp) = log --first-parent +* [git lto](./git-lto) = log --topo-order + +git ls-files: + +* [git ls](./git-ls) = ls-files +* [git lsd](./git-lsd) = ls-files --debug +* [git lsfn](./git-lsfn) = ls-files --full-name +* [git lsio](./git-lsio) = ls-files --ignored --others --exclude-standard + +git merge: + +* [git m](./git-m) = merge +* [git ma](./git-ma) = merge --abort +* [git mc](./git-mc) = merge --continue +* [git me](./git-me) = merge --no-commit --no-ff + +git pull: + +* [git pf](./git-pf) - git pull with fast-forward only +* [git pr](./git-pr) - git pull with rebase +* [git pp](./git-pp) - git pull with rebase preserve of merge commits + +git rebase: + +* [git rb](./git-rb) = rebase +* [git rba](./git-rb) = rebase --abort +* [git rbc](./git-rbc) = rebase --continue +* [git rbs](./git-rbs) = rebase --skip +* [git rbi](./git-rbi) = rebase --interactive +* [git rbiu](./git-rbiu) = rebase --interactive @{upstream} + +git reflog: + +* [git rl](./git-rl) = reflog + +git remote: + +* [git rr](./git-rr) = remote +* [git rrs](./git-rrs) = remote show +* [git rru](./git-rru) = remote update +* [git rrp](./git-rrp) = remote prune + +git revert: + +* [git rv](./git-rv) = revert +* [git rvnc](./git-rvnc) = revert --no-commit + +git show-branch: + +* [git sb](./git-sb) = show-branch +* [git sbdo](./git-sbdo) = show-branch --date-order +* [git sbto](./git-sbto) = show-branch --topo-order + +git submodule: + +* [git sm](./git-sm) = submodule +* [git smi](./git-smi) = submodule init +* [git sma](./git-sma) = submodule add +* [git sms](./git-sms) = submodule sync +* [git smu](./git-smu) = submodule update +* [git smui](./git-smui) = submodule update --init +* [git smuir](./git-smuir) = submodule update --init --recursive + +git status: + +* [git s](./git-s) = status +* [git ss](./git-ss) = status --short +* [git ssb](./git-ssb) = status --short --branch + + +## Friendly aliases + +Start: + +* [git initer](./git-initer) - Initialize a repo with an empty rebaseable commit. +* [git cloner](./git-cloner) - Clone a repo and recurse on any of its submodules. + +Branch names: + +* [git default-branch](./git-default-branch) - Get the default branch name. +* [git current-branch](./git-current-branch) - Get the current branch name. +* [git upstream-branch](./git-upstream-branch) - Get the upstream branch name. +* [git topic-base](./git-topic-base) - Get the topic branch name. + +List items: + +* [git aliases](./git-aliases) - List aliases. +* [git branches](./git-branches) - List branches. +* [git tags](./git-tags) - List tags. +* [git stashes](./git-stashes) - List stashes. + +Undo: + +* [git uncommit](./git-uncommit) = reset --soft HEAD~1 +* [git unadd](./git-unadd) = reset HEAD + + +## Convenience alaises + +Logging & reporting: + +* [git log](./git-log) +* [git who](./git-who) +* [git chart](./git-chart) +* [git churn](./git-churn) +* [git summary](./git-summary) + +Lookups: + +* [git whois](./git-whois) - Try to figure out an author's information. +* [git whatis](./git-whatis) - Try to figure out an object's information. + +Commit details: + +* [git commit-parents](./git-commit-parents) - Show the commit's parents. +* [git commit-is-merge](./git-commit-is-merge) - Is the commit a merge commit? +* [git commit-message-key-lines](./git-commit-message-key-lines) + +Add all & edit all: + +* [git add-*](./git-edit) - Add all files of a given type. +* [git edit-*](./git-edit) - Edit all files of a given type. + +Alias helpers: + +* [git add-alias](./git-add-alias) - Create a new git alias. +* [git move-alias](./git-move-alias) - Rename an existing git alias. + +Script helpers: + +* [git top-name](./git-top-name) - Get the top level directory name. +* [git exec](./git-exec) - Execute a shell script. + +Remotes: + +* [git remotes-prune](./git-remotes-prune) - For each remote branch, prune it. +* [git remotes-push](./git-remotes-push) - For each remote branch, push it. + +Misc: + +* [git diff-*](./git-diff) +* [git grep-*](./git-grep) +* [git merge-span-*](./git-merge-span) +* [git orphans](./git-orphans) +* [git fixup](./git-fixup) +* [git rev-list-all-objects-by-size](./git-rev-list-all-objects-by-size) +* [git rev-list-all-objects-by-size-and-name](./git-rev-list-all-objects-by-size-and-name) +* [git cherry-pick-merge](./git-cherry-pick-merge) +* [git refs-by-date](./git-refs-by-date) - Sort by date for branches. + +Advanced aliases: + +* [git search-commits](./git-search-commits) +* [git debug](./git-debug) +* [git intercommit](./git-intercommit) + + +## Workflow aliases + +Starting: + +* [git clone-lean](./git-clone-lean) + +Save: + +* [git archive](./git-archive) - Create an archive file of everything in the repo. +* [git snapshot](./git-snapshot) - Stash a snapshot of your current working tree. +* [git panic](./git-panic) - When you're worried the world is coming to an end. + +Flow aliases: + +* [git get & git put](./git-get-git-put) +* [git ours & git theirs](./git-ours-git-theirs) +* [git wip & git unwip](./git-wip-git-unwip) +* [git assume & git unassume](./git-assume-git-unassume) +* [git publish & git unpublish](./git-publish-git-unpublish) + +reset & undo: + +* [git reset-*](./git-reset) - Move backwards on the commit chain. +* [git undo-*](./git-undo) - Move backwards on the commit chain. + +track & untrack: + +* [git track](./git-track) - Start tracking from a local branch to upstream branch. +* [git untrack](./git-untrack) - Stop tracking from a local branch to upstream branch. + +inbound & outbound: + +* [git inbound](./git-inbound) - Show incoming changes compared to upstream. +* [git outbound](./git-outbound) - Show outgoing changes compared to upstream. + +pull1 & push1: + +* [git pull1](./git-pull1) - Pull just the current branch. +* [git push1](./git-push1) - Push just the current branch. + +Topic branches: + +* [git topic-*](./git-topic) - Read this first about topic branches. +* [git topic-base](./git-topic-base) - Show the topic branch name. +* [git topic-start](./git-topic-start) - Begin a topic branch. +* [git topic-stop](./git-topic-stop) - End a topic branch. +* [git topic-sync](./git-topic-sync) - Update a topic branch. +* [git topic-move](./git-topic-move) - Rename a topic branch. + +Cull: + +* [git cull](./git-cull-local) - Delete all branches that are merged. +* [git cull-locals](./git-cull-local) - Delete local branches that are merged. +* [git cull-remotes](./git-cull-remote) - Delete remote branches that are merged. + +Maintenance tuning: + +* [git cleaner](./git-cleaner) - Clean the recommend way. +* [git pruner](./git-pruner) - Prune the recommened way. +* [git repacker](./git-repacker) - Repack the recommended way. +* [git optimizer](./git-optimizer) - Optimize the recommended way. + +Misc: + +* [git issues](./git-issues) - Show issues that are described in commit messages. +* [git expunge](./git-expunge) - Use filter-branch to delete a file everywhere. +* [git reincarnate](./git-reincarnate) - Kill a branch then create it anew. +* [git diff-chunk](./git-diff-chunk) - Do a diff of two chunks in revisions. +* [git last-tag](./git-last-tag) - Show the last tag in the current branch. +* [git serve](./git-serve) - Serve the local directory via git server daemon. +* [git track-all-remote-branches](./git-track-all-remote-branches) - Track all remote branches. +# [git cleanout](./git-cleanout) - Clean and discard changes and untracked files in working tree. + + +## Tooling aliases + +Use gitk: + +* [git gitk-conflict](./git-gitk-conflict) - Use gitk to show conflicting merge. +* [git gitk-history-all](./git-history-all) - Use gitk to show full history. + +Use other version control systems: + +* [git cvs-*](./git-cvs) - Use CVS version control. +* [git svn-*](./git-svn) - Use Subversion version control. + +Use graphviz: + +* [git graphviz](./git-graphviz) - Use graphviz for display. + + diff --git a/doc/index/index.md b/doc/index/index.md deleted file mode 100644 index cc8e12fe..00000000 --- a/doc/index/index.md +++ /dev/null @@ -1,6 +0,0 @@ -+++ -title = "Git Alias" -sort_by = "name" -template = "base.html" -page_template = "base.html" -+++ diff --git a/doc/install/install.md b/doc/install/install.md index 1dd1653d..55939cd6 100644 --- a/doc/install/install.md +++ b/doc/install/install.md @@ -1,5 +1,4 @@ +++ -page_template = "base.html" +++ # Install diff --git a/doc/introduction/introduction.md b/doc/introduction/introduction.md index 821ae784..11337c0f 100644 --- a/doc/introduction/introduction.md +++ b/doc/introduction/introduction.md @@ -1,5 +1,4 @@ +++ -page_template = "base.html" +++ # Introduction diff --git a/doc/more/more.md b/doc/more/more.md index 8fc8a490..ce94ac62 100644 --- a/doc/more/more.md +++ b/doc/more/more.md @@ -1,5 +1,4 @@ +++ -page_template = "base.html" +++ # Resources diff --git a/doc/start.md b/doc/start.md new file mode 100644 index 00000000..52d9d43d --- /dev/null +++ b/doc/start.md @@ -0,0 +1,351 @@ ++++ ++++ + +# Git Alias + +This project provides many git alias commands that you can use as you like. + +* [Introduction](./introduction) +* [Install](./install) +* [Examples](./examples) +* [Customize](./customize) +* [Contributing](./contributing) +* [Thanks](./thanks.html) +* [To do](./todo.html) +* [More](./more.html) + + +## One letter aliases + +One letter aliases are for our most-frequent commands: + +* [git a](./git-a) = add +* [git b](./git-b) = branch +* [git c](./git-c) = commit +* [git d](./git-d) = diff +* [git f](./git-f) = fetch +* [git g](./git-g) = grep +* [git l](./git-l) = log +* [git m](./git-m) = merge +* [git o](./git-o) = checkout +* [git p](./git-p) = pull +* [git s](./git-s) = status +* [git w](./git-w) = whatchanged + +One-letter aliases never use options, because we want +the aliases to be easy to compose and to be flexible. + + +## Short aliases for frequent commands + +Short aliases are for our very-frequent commands: + +git add: + +* [git a](./git-a) = add +* [git aa](./git-aa) = add --all +* [git ap](./git-ap) = add --patch +* [git au](./git-au) = add --update + +git branch: + +* [git b](./git-bm) = branch +* [git bm](./git-bm) = branch --merged +* [git bnm](./git-bm) = branch --no-merged +* [git bed](./git-bed) = branch --edit-description +* [git bsd](./git-bsd) = branch --show-description (wishlist) + +git commit: + +* [git c](./git-ca) = commit +* [git ca](./git-ca) = commit --amend +* [git cam](./git-cam) = commit --amend --message +* [git cane](./git-cane) = commit --amend --no-edit +* [git ci](./git-ci) = commit --interactive +* [git cm](./git-ci) = commit --message + +git checkout: + +* [git co](./git-co) = checkout +* [git cog](./git-cog) = checkout --guess +* [git cong](./git-cong) = checkout --no-guess + +git cherry-pick: + +* [git cp](./git-cp) = cherry-pick +* [git cpa](./git-cpa) = cherry-pick --abort +* [git cpc](./git-cpc) = cherry-pick --continue +* [git cpn](./git-cpn) = cherry-pick -n (--no-commit) +* [git cpnx](./git-cpnx) = cherry-pick -n -x (--no-commit and with a message) + +git diff: + +* [git d](./git-d) = diff +* [git dd](./git-dd) = diff with our preferred settings +* [git dc](./git-dc) = diff --cached +* [git ds](./git-ds) = diff --staged +* [git dwd](./git-ds) = diff --word-diff + +git grep: + +* [git g](./git-g) = grep +* [git gg](./git-gg) = grep with our preferred settings +* [git gn](./git-gn) = grep -n (--line-number) + +git log: + +* [git l](./git-l) = log +* [git ll](./git-ll) = log with our preferred short settings +* [git lll](./git-lll) = log with our preferred long settings +* [git lg](./git-lg) = log --graph +* [git lo](./git-lo) = log --oneline +* [git lp](./git-lp) = log --patch +* [git lfp](./git-lfp) = log --first-parent +* [git lto](./git-lto) = log --topo-order + +git ls-files: + +* [git ls](./git-ls) = ls-files +* [git lsd](./git-lsd) = ls-files --debug +* [git lsfn](./git-lsfn) = ls-files --full-name +* [git lsio](./git-lsio) = ls-files --ignored --others --exclude-standard + +git merge: + +* [git m](./git-m) = merge +* [git ma](./git-ma) = merge --abort +* [git mc](./git-mc) = merge --continue +* [git me](./git-me) = merge --no-commit --no-ff + +git pull: + +* [git pf](./git-pf) - git pull with fast-forward only +* [git pr](./git-pr) - git pull with rebase +* [git pp](./git-pp) - git pull with rebase preserve of merge commits + +git rebase: + +* [git rb](./git-rb) = rebase +* [git rba](./git-rb) = rebase --abort +* [git rbc](./git-rbc) = rebase --continue +* [git rbs](./git-rbs) = rebase --skip +* [git rbi](./git-rbi) = rebase --interactive +* [git rbiu](./git-rbiu) = rebase --interactive @{upstream} + +git reflog: + +* [git rl](./git-rl) = reflog + +git remote: + +* [git rr](./git-rr) = remote +* [git rrs](./git-rrs) = remote show +* [git rru](./git-rru) = remote update +* [git rrp](./git-rrp) = remote prune + +git revert: + +* [git rv](./git-rv) = revert +* [git rvnc](./git-rvnc) = revert --no-commit + +git show-branch: + +* [git sb](./git-sb) = show-branch +* [git sbdo](./git-sbdo) = show-branch --date-order +* [git sbto](./git-sbto) = show-branch --topo-order + +git submodule: + +* [git sm](./git-sm) = submodule +* [git smi](./git-smi) = submodule init +* [git sma](./git-sma) = submodule add +* [git sms](./git-sms) = submodule sync +* [git smu](./git-smu) = submodule update +* [git smui](./git-smui) = submodule update --init +* [git smuir](./git-smuir) = submodule update --init --recursive + +git status: + +* [git s](./git-s) = status +* [git ss](./git-ss) = status --short +* [git ssb](./git-ssb) = status --short --branch + + +## Friendly aliases + +Start: + +* [git initer](./git-initer) - Initialize a repo with an empty rebaseable commit. +* [git cloner](./git-cloner) - Clone a repo and recurse on any of its submodules. + +Branch names: + +* [git default-branch](./git-default-branch) - Get the default branch name. +* [git current-branch](./git-current-branch) - Get the current branch name. +* [git upstream-branch](./git-upstream-branch) - Get the upstream branch name. +* [git topic-base](./git-topic-base) - Get the topic branch name. + +List items: + +* [git aliases](./git-aliases) - List aliases. +* [git branches](./git-branches) - List branches. +* [git tags](./git-tags) - List tags. +* [git stashes](./git-stashes) - List stashes. + +Undo: + +* [git uncommit](./git-uncommit) = reset --soft HEAD~1 +* [git unadd](./git-unadd) = reset HEAD + + +## Convenience alaises + +Logging & reporting: + +* [git log](./git-log) +* [git who](./git-who) +* [git chart](./git-chart) +* [git churn](./git-churn) +* [git summary](./git-summary) + +Lookups: + +* [git whois](./git-whois) - Try to figure out an author's information. +* [git whatis](./git-whatis) - Try to figure out an object's information. + +Commit details: + +* [git commit-parents](./git-commit-parents) - Show the commit's parents. +* [git commit-is-merge](./git-commit-is-merge) - Is the commit a merge commit? +* [git commit-message-key-lines](./git-commit-message-key-lines) + +Add all & edit all: + +* [git add-*](./git-edit) - Add all files of a given type. +* [git edit-*](./git-edit) - Edit all files of a given type. + +Alias helpers: + +* [git add-alias](./git-add-alias) - Create a new git alias. +* [git move-alias](./git-move-alias) - Rename an existing git alias. + +Script helpers: + +* [git top-name](./git-top-name) - Get the top level directory name. +* [git exec](./git-exec) - Execute a shell script. + +Remotes: + +* [git remotes-prune](./git-remotes-prune) - For each remote branch, prune it. +* [git remotes-push](./git-remotes-push) - For each remote branch, push it. + +Misc: + +* [git diff-*](./git-diff) +* [git grep-*](./git-grep) +* [git merge-span-*](./git-merge-span) +* [git orphans](./git-orphans) +* [git fixup](./git-fixup) +* [git rev-list-all-objects-by-size](./git-rev-list-all-objects-by-size) +* [git rev-list-all-objects-by-size-and-name](./git-rev-list-all-objects-by-size-and-name) +* [git cherry-pick-merge](./git-cherry-pick-merge) +* [git refs-by-date](./git-refs-by-date) - Sort by date for branches. + +Advanced aliases: + +* [git search-commits](./git-search-commits) +* [git debug](./git-debug) +* [git intercommit](./git-intercommit) + + +## Workflow aliases + +Starting: + +* [git clone-lean](./git-clone-lean) + +Save: + +* [git archive](./git-archive) - Create an archive file of everything in the repo. +* [git snapshot](./git-snapshot) - Stash a snapshot of your current working tree. +* [git panic](./git-panic) - When you're worried the world is coming to an end. + +Flow aliases: + +* [git get & git put](./git-get-git-put) +* [git ours & git theirs](./git-ours-git-theirs) +* [git wip & git unwip](./git-wip-git-unwip) +* [git assume & git unassume](./git-assume-git-unassume) +* [git publish & git unpublish](./git-publish-git-unpublish) + +reset & undo: + +* [git reset-*](./git-reset) - Move backwards on the commit chain. +* [git undo-*](./git-undo) - Move backwards on the commit chain. + +track & untrack: + +* [git track](./git-track) - Start tracking from a local branch to upstream branch. +* [git untrack](./git-untrack) - Stop tracking from a local branch to upstream branch. + +inbound & outbound: + +* [git inbound](./git-inbound) - Show incoming changes compared to upstream. +* [git outbound](./git-outbound) - Show outgoing changes compared to upstream. + +pull1 & push1: + +* [git pull1](./git-pull1) - Pull just the current branch. +* [git push1](./git-push1) - Push just the current branch. + +Topic branches: + +* [git topic-*](./git-topic) - Read this first about topic branches. +* [git topic-base](./git-topic-base) - Show the topic branch name. +* [git topic-start](./git-topic-start) - Begin a topic branch. +* [git topic-stop](./git-topic-stop) - End a topic branch. +* [git topic-sync](./git-topic-sync) - Update a topic branch. +* [git topic-move](./git-topic-move) - Rename a topic branch. + +Cull: + +* [git cull](./git-cull-local) - Delete all branches that are merged. +* [git cull-locals](./git-cull-local) - Delete local branches that are merged. +* [git cull-remotes](./git-cull-remote) - Delete remote branches that are merged. + +Maintenance tuning: + +* [git cleaner](./git-cleaner) - Clean the recommend way. +* [git pruner](./git-pruner) - Prune the recommened way. +* [git repacker](./git-repacker) - Repack the recommended way. +* [git optimizer](./git-optimizer) - Optimize the recommended way. + +Misc: + +* [git issues](./git-issues) - Show issues that are described in commit messages. +* [git expunge](./git-expunge) - Use filter-branch to delete a file everywhere. +* [git reincarnate](./git-reincarnate) - Kill a branch then create it anew. +* [git diff-chunk](./git-diff-chunk) - Do a diff of two chunks in revisions. +* [git last-tag](./git-last-tag) - Show the last tag in the current branch. +* [git serve](./git-serve) - Serve the local directory via git server daemon. +* [git track-all-remote-branches](./git-track-all-remote-branches) - Track all remote branches. +# [git cleanout](./git-cleanout) - Clean and discard changes and untracked files in working tree. + + +## Tooling aliases + +Use gitk: + +* [git gitk-conflict](./git-gitk-conflict) - Use gitk to show conflicting merge. +* [git gitk-history-all](./git-history-all) - Use gitk to show full history. + +Use other version control systems: + +* [git cvs-*](./git-cvs) - Use CVS version control. +* [git svn-*](./git-svn) - Use Subversion version control. + +Use graphviz: + +* [git graphviz](./git-graphviz) - Use graphviz for display. + + diff --git a/doc/thanks/thanks.md b/doc/thanks/thanks.md index 49ee1c14..756c9d23 100644 --- a/doc/thanks/thanks.md +++ b/doc/thanks/thanks.md @@ -1,5 +1,4 @@ +++ -page_template = "base.html" +++ # Thanks diff --git a/doc/todo/todo.md b/doc/todo/todo.md index 90ddcccf..133f499e 100644 --- a/doc/todo/todo.md +++ b/doc/todo/todo.md @@ -1,5 +1,4 @@ +++ -page_template = "base.html" +++ # To do list