diff --git a/README.md b/README.md index 4fc7400..8f359ba 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ It is recommended to use this file to set your user info. Alternately, you can s * `git t` or `gt`- a list of tags with info * `git nb` or `gnb`- a (n)ew (b)ranch - like checkout -b * `git cp` or `gcp`- cherry-pick -x (showing what was cherrypicked) - * `git changelog` - a nice format for creating changelogs + * `git simple` - a clean format for creating changelogs * `git recent-branches` - if you forgot what you've been working on * `git unstage` / `guns` (remove from index) and `git uncommit` / `gunc` (revert to the time prior to the last commit - dangerous if already pushed) aliases * Some sensible default configs, such as improving merge messages, push only pushes the current branch, removing status hints, and using mnemonic prefixes in diff: (i)ndex, (w)ork tree, (c)ommit and (o)bject diff --git a/git/gitconfig b/git/gitconfig index 28943ac..9931269 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -49,7 +49,7 @@ l = log --graph --date=short changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" - changelog = log --pretty=format:\" * %s\" + simple = log --pretty=format:\" * %s\" shortnocolor = log --pretty=format:\"%h %cr %cn %s\" # pull