On 03/28/2013 11:33 AM, John McKown wrote:
I do that, partially at least. I track the files in /etc. But I
generally only do it after I do a yum upgrade. All I do is:
cd /etc
sudo git init #well, only the first time
sudo git add -A .
sudo git commit -m "commit message"
You could just get in th
> From: Paul Smith
>
> Maybe I should restate. The problem is that if I run "git apply"
> followed by "git commit -a", the files that were modified and deleted
> are both committed, but new files from the patch are not committed.
That is true.
> I sort of understand it from a Git point of view
I do that, partially at least. I track the files in /etc. But I generally
only do it after I do a yum upgrade. All I do is:
cd /etc
sudo git init #well, only the first time
sudo git add -A .
sudo git commit -m "commit message"
You could just get in the habit of doing the last two every time you m
On Thu, 2013-03-28 at 10:22 -0400, Dale R. Worley wrote:
> > When apply is done and I run "git status -s", the files that were
> > specified as deleted in the diff are marked as " D" but the files that
> > were specified as added in the diff are marked as "??" (untracked), not
> > " A" as I'd expec
I'm considering using Git to track the customizations I make to the
system files of my Linux box. Has anyone done that and has hints on
how to make it work well?
Actually, I have two Linux boxes, and I need to track both sets of
customizations. It looks easy enough to have one repository on each
Hello,
I can add a submodule just fine, and first time it pulls the update.
When I clone and pull updates, however, there is no submodule joy. git
submodule init, git submodule foreach git pull origin master, no joy.
I must be missing something, or I need to apply a Git update, or something?
A
Well you're a seasoned git dude, but there are some good refcardz on the
site so its doesn't have to be a throw away. Yeah the cards have gotten
commercial lately but, I try to overlook that, I thought there was some
interesting perspectives in it that might benefit a large organization.
Noth
> From: Paul Smith
>
> Sorry, I was unclear. No, I didn't use --index as I wanted to see the
> applied content before it was committed.
>
> I ran "git diff -M -C master" to generate the patch of changes between
> my working directory and the master branch, then ran "git apply" (no
> arguments)
Hi all!
With *Git 1.7.9.5*, I am trying to configure a merge tool that should apply
only on .po/.pot (gettext) files. I have this config for acomplish the same
for merge/diff:
In .gitattributes:
*.po merge=pofile
*.pot merge=pofile
*.po diff=pofile
*.pot diff=pofile
In .gitconfig:
[me
