Tim's Tips and Tricks - Revision history

Tim Bird: /* Git tips */

2013-06-13T16:45:48Z

‎Git tips

2013-06-13T16:44:33Z

‎Git tips

2013-06-13T16:29:16Z

‎Git tips

2013-04-19T16:53:59Z

‎Git tips

2013-04-19T16:52:42Z

‎Git tips: add a few more tips

2012-12-12T21:11:53Z

‎board handling

2012-12-11T00:48:01Z

‎Git tips

2012-11-05T17:39:11Z

‎Git tips

2012-10-23T20:23:14Z

‎board handling

2012-10-23T20:21:12Z

‎Git tips

@@ Line 67: / Line 67: @@
 ** show a graph of the history of the tree, only showing 'notable' (named) commits.  This is good for showing the branch structure, if you've been tagging your branches
-* git log --merges --date=short --format=format:"%cd %s %h" | grep "Merge.*to" | sed "s/Merge.*to //g" | sort -n | unique
+* git log --merges --date=short --format=format:"%cd %s %h" | grep "Merge.*to" | sed "s/Merge.*to //g" | sort -n | uniq
 ** IF your merges include the phrase "Merger ... into <branch_name>", then this command shows a list of dates when merge commits were done, and the branch name used for that merge commit.  This is good for showing the name of a branch at a specified period of time (to help understand branch history)

@@ Line 57: / Line 57: @@
 * git show <commit-id>:file1
 ** show the version of file at the specified commit
 === patch management ===

@@ Line 54: / Line 54: @@
 * git log -- file1
 ** show log for deleted file 'file1'
 === patch management ===

@@ Line 52: / Line 52: @@
 * git log -G<search_string> --all
 ** show log entries for the entire git history (including deleted files) for the search string on any added or removed lines
 === patch management ===

@@ Line 46: / Line 46: @@
 * git rebase origin/master --autosquash
 - Automatically updates an existing patch
 === patch management ===

@@ Line 88: / Line 88: @@
 *** but can do other setups: feed kernel through serial line, put kernel on SD card using known-good kernel, etc.
-* ttc - command line tool for board control
+* [[Ttc]] - command line tool for board control
 ** abstracts differences between boards
 ** allows for board sharing (ttc reserve)

← Older revision		Revision as of 00:48, 11 December 2012
Line 20:		Line 20:

	* git proxy (finally!!)		* git proxy (finally!!)
		+	** See [[Using git with a proxy]]

	* git grep (grep only git-managed files) (credit to Thomas Petazzoni)		* git grep (grep only git-managed files) (credit to Thomas Petazzoni)

@@ Line 27: / Line 27: @@
 other generated files you may have in your tree, if you're not doing
 out of tree builds. I use 'git grep' routinely.
 ----
@@ Line 32: / Line 38: @@
 ** git add -p
 ** git commit --amend
 === patch management ===

@@ Line 124: / Line 124: @@
 * ptxdist and barebox (Credit to Robert Schwebel)
 ** can load kernel via nfs server (does not require root privileges on host)
 === personal productivity ===

← Older revision		Revision as of 20:21, 23 October 2012
Line 30:		Line 30:

	* several people said: "git rebase -i" as a replacement for quilt		* several people said: "git rebase -i" as a replacement for quilt
		+	** git add -p
		+	** git commit --amend

	=== patch management ===		=== patch management ===