gotofritz · August 22, 2017 18:33
diff --git a/git-current-repo.sh b/git-current-repo.sh
 # tells you name of current repo
 git rev-parse --abbrev-ref HEAD
diff --git a/git-log-with-content.sh b/git-log-with-content.sh
 # from http://stackoverflow.com/a/5493663/345007
 # --follow deals with name changes
 # -p does whole diffs
 # -- stops input and treats rest as arguments (i.e., filenames)
 git log --follow -p -- file
diff --git a/git-log-with-filelist.sh b/git-log-with-filelist.sh
 # finds what files where changed in a specific commit
 # --stat: list of files
 # --pretty=oneline: makes output terse
 # -n 1: just the one commit
 git log --stat --pretty=oneline -n 1[hash]
diff --git a/git-resolve-conflicts-theirs.sh b/git-resolve-conflicts-theirs.sh
 # after your pull creates a lot of conflincts, if you just want to accept other devs' changes
 grep -lr '<<<<<<<' . | xargs git checkout --theirs
diff --git a/git-squash-commits.sh b/git-squash-commits.sh
 # from http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git#5189600

 # undo last X commits, and commit with a new message as one
 git reset --soft HEAD~X
 git commit -a -m "COMMIT MESSAGE"

 # undo last X commits, and commit with old messages
 git reset --soft HEAD~X 
 git commit --edit -m"$(git log --format=%B --reverse HEAD..HEAD@{1})"

 # the kosher way of doing previous example
 git rebase -i <sha-of-last-commit-BEFORE-the-ones-you-are-after>
 (this will open an editor window, where you have to manually change all the "pick" except the first one to "squash")
diff --git a/git-sync.sh b/git-sync.sh
 function git-sync {
  # Checks name of current branch
 	repo=`git rev-parse --abbrev-ref HEAD`
 	# If this is a fork, there must be an 'original' (in git jargon an 'upstream') somewhere.
 	# This assumes the git upstream was set with `git remote add upstream git@xxxx`
 	# And that the master is used to sync with upstream, with everyone working on branches
 	git checkout master && git pull origin master && git fetch upstream &&  git merge upstream/master && git push origin master
 	# If you were in a branch, go back to it, and merge what you have just fetched
 	if [ '$repo' != 'master' ]; then
 			git checkout $repo && git merge origin master && git push origin $repo
 	fi
 	git status
 }
diff --git a/git-which-branch.sh b/git-which-branch.sh
 # list branches which contains a commit
 git branch --contains <commit>
	# tells you name of current repo
	git rev-parse --abbrev-ref HEAD
	# from http://stackoverflow.com/a/5493663/345007
	# --follow deals with name changes
	# -p does whole diffs
	# -- stops input and treats rest as arguments (i.e., filenames)
	git log --follow -p -- file
	# finds what files where changed in a specific commit
	# --stat: list of files
	# --pretty=oneline: makes output terse
	# -n 1: just the one commit
	git log --stat --pretty=oneline -n 1[hash]
	# after your pull creates a lot of conflincts, if you just want to accept other devs' changes
	grep -lr '<<<<<<<' . \| xargs git checkout --theirs
	# from http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git#5189600

	# undo last X commits, and commit with a new message as one
	git reset --soft HEAD~X
	git commit -a -m "COMMIT MESSAGE"

	# undo last X commits, and commit with old messages
	git reset --soft HEAD~X
	git commit --edit -m"$(git log --format=%B --reverse HEAD..HEAD@{1})"

	# the kosher way of doing previous example
	git rebase -i <sha-of-last-commit-BEFORE-the-ones-you-are-after>
	(this will open an editor window, where you have to manually change all the "pick" except the first one to "squash")
	function git-sync {
	# Checks name of current branch
	repo=`git rev-parse --abbrev-ref HEAD`
	# If this is a fork, there must be an 'original' (in git jargon an 'upstream') somewhere.
	# This assumes the git upstream was set with `git remote add upstream git@xxxx`
	# And that the master is used to sync with upstream, with everyone working on branches
	git checkout master && git pull origin master && git fetch upstream && git merge upstream/master && git push origin master
	# If you were in a branch, go back to it, and merge what you have just fetched
	if [ '$repo' != 'master' ]; then
	git checkout $repo && git merge origin master && git push origin $repo
	fi
	git status
	}
	# list branches which contains a commit
	git branch --contains <commit>