File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed
Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 106106 last added it. This means that if we commit our snapshot right now, we will
107107 be recording the version of the file when we last ran < code > git add</ code > ,
108108 not the version that is on our disk. Git does not assume that what the file
109- looks like on disk is neccesarily what you want to snapshot - you have to
109+ looks like on disk is necessarily what you want to snapshot - you have to
110110 tell Git with the < code > git add</ code > command.
111111 </ p >
112112
Original file line number Diff line number Diff line change 4040 < div class ="block ">
4141 < p > We've already seen how to use < code > git log</ code > to compare branches,
4242 by looking at the commits on one branch that are not reachable from another.
43- (If you don't remember, it looks like this: < code > git log branchA ^branchB</ code > .
43+ (If you don't remember, it looks like this: < code > git log branchA ^branchB</ code > ) .
4444 However, you can also use < code > git log</ code > to look for specific commits.
4545 Here we'll be looking at some of the more commonly used < code > git log</ code >
4646 options, but there are many. Take a look at the official docs for the whole
368368 2 files changed, 3 insertions(+), 3 deletions(-)
369369</ pre >
370370
371- < p > To compare two divergant branches, however, you can run something like
371+ < p > To compare two divergent branches, however, you can run something like
372372 < code > git diff branchA branchB</ code > but the problem is that it will do
373373 exactly what you are asking - it will basically give you a patch file that
374374 would turn the snapshot at the tip of branchA into the snapshot at the tip
Original file line number Diff line number Diff line change 190190
191191 < p > The second command that will fetch down new data from a remote server is
192192 < code > git pull</ code > . This command will basically run a < code > git fetch</ code >
193- immediately follwed by a < code > git merge</ code > of the branch on that remote
193+ immediately followed by a < code > git merge</ code > of the branch on that remote
194194 that is tracked by whatever branch you are currently in. I personally don't much
195195 like this command - I prefer running < code > fetch</ code > and < code > merge</ code >
196196 seperately. Less magic, less problems. However, if you like this idea, you
You can’t perform that action at this time.
0 commit comments