On Fri, Jun 23, 2017 at 2:41 PM, Nic Attard <nicatt...@gmail.com> wrote:
> Hi everyone,
>
> I'm brand new to git, I've been using it for about 2 days :)
>
> I have setup a private repo on bitbucket, and have a local repo on my
> macbook, which I use during the day travelling for work, and another local
> repo at home on my windows desktop. That is working well, I can make
> changes on the macbook during the day, commit them and push them up to the
> remote repo. Then at night when I get home, I do a "git pull origin master"
> and all the days updates are on my windows machine, where I can continue
> working.
>
> After being on the macbook all day, when I get home I'd like to see what
> is out of sync between my windows repo and the remote repo. I know I can do
> this with "git diff master origin/master" but this shows all the line level
> changes, is there a way to display only files that are out of sync, without
> showing the actual line level changes?
>
I do that quite often:
git diff --name-status <old> <new>
or, in your example:
git diff --name-status master origin/master
The output has two columns, and one row for each changed member.
Possible status letters are:
· A: addition of a file
· C: copy of a file into a new one
· D: deletion of a file
· M: modification of the contents or mode of a file
· R: renaming of a file
· T: change in the type of the file
· U: file is unmerged (you must complete the merge before it can
be committed)
· X: "unknown" change type (most probably a bug, please report it)
>
> Thank you.
>
>
--
Veni, Vidi, VISA: I came, I saw, I did a little shopping.
Maranatha! <><
John McKown
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
