Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Last tag #21

Merged
merged 3 commits into from
Oct 10, 2016
Merged

Last tag #21

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d03745
Remove trailing spaces
phdru Oct 6, 2016
66e953b
Fix ll: add missing apostrophe
phdru Oct 6, 2016
0c9c09f
Add lasttag and lasttagged
phdru Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions gitalias.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

# commit - amend the tip of the current branch, and do not edit the message.
can = commit --amend --no-edit

# commit interactive
ci = commit --interactive

Expand Down Expand Up @@ -119,12 +119,12 @@

# log with items appearing in topological order, i.e. descendant commits are shown before their parents.
lt = log --topo-order

# log key - our favorite way to show our key performance indicators, i.e. our most useful summary.
lk = log --graph --topo-order --abbrev-commit --date=short --decorate --all --boundary --pretty=format:'%Cgreen%ad %Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue[%cn]%Creset %Cblue%G?%Creset'

# log latest - show the 10 most recent lines using `lk`
ll = log -n 10 --graph --topo-order --abbrev-commit --date=short --decorate --all --boundary --pretty=format:'%Cgreen%ad
ll = log -n 10 --graph --topo-order --abbrev-commit --date=short --decorate --all --boundary --pretty=format:'%Cgreen%ad'


## ls-files ##
Expand Down Expand Up @@ -285,6 +285,12 @@
add-global-alias = "!git add-alias --global"
add-local-alias = "!git add-alias --local"

# Last tag in the current branch
lasttag = describe --tags --abbrev=0

# Latest annotated tag in all branches
lasttagged = !git describe --tags `git rev-list --tags --max-count=1`

# Show our tags
tags = tag -n1 --list

Expand Down Expand Up @@ -545,13 +551,13 @@
unwip = !"git log -n 1 | grep -q -c wip && git reset HEAD~1"

# Assume
#
#
# Sometimes we want to change a file in a repo, but never check in your edits.
# We can't use .gitignore because the file is tracked. We use update-index.
#
# If you interact with big corporate projects, such as projects in Subversion,
# then you might run into the need to ignore certain files which are under
# Subversion control, yet you need to modify them but not commit.
# then you might run into the need to ignore certain files which are under
# Subversion control, yet you need to modify them but not commit.
# The assume-unchanged flag comes to the rescue.
#
# Suppose we want to edit passwords.txt and for god's sake never check it in:
Expand All @@ -574,7 +580,7 @@
#
# Thanks to http:https://durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/
# Thanks to http:https://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/

assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assume-all = "!git st -s | awk {'print $2'} | xargs git assume"
Expand Down Expand Up @@ -611,8 +617,8 @@
branches = branch -a
tags = tag
stashes = stash list


### SHELL SCRIPTING ALIASES ###

# Get the current branch name
Expand Down