projects
/
lambda.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d0fcac
)
Notes for understanding git
author
Chris
<chris.barker@nyu.edu>
Wed, 4 Feb 2015 17:51:49 +0000
(12:51 -0500)
committer
Chris
<chris.barker@nyu.edu>
Wed, 4 Feb 2015 17:51:49 +0000
(12:51 -0500)
notes-git
[new file with mode: 0644]
patch
|
blob
diff --git a/notes-git
b/notes-git
new file mode 100644
(file)
index 0000000..
4ccb972
--- /dev/null
+++ b/
notes-git
@@ -0,0
+1,9
@@
+git commit -a : -a stages all files that are tracked and modified
+ without needing to explicitly git add them.
+git remote show origin
+git pull origin master
+when ready to post:
+ git checkout shared
+ git merge cb
+git mergetool (requires setting [merge] tool = vimdiff in config)
+git pull = fetch + merge