#x27; or 'Highlight this only'
(e.g `xmerge.c`).
6) See the short file name (`xmerge.c`) instead of the full path
(`xdiff/xmerge.c`) in the 'Find commit touching path:' edit field. No
commits touching the file can be found.
--
Mit freundlichen Grüßen,
Anatoly Borodin
Hi,
the IP will not be overwritten, you'll still have the new IP in
master. Nothing to worry about :)
--
Mit freundlichen Grüßen,
Anatoly Borodin
Hi All,
are there plans to add submodules support to git-archive?
--
Mit freundlichen Grüßen,
Anatoly Borodin
probably depend on the default value of color.ui).
The same story with color.diff and git-show, color.grep, etc.
Is it me being a non-native English speaker, or does this part really
need to be rewritten?
PS git version 2.9.3
--
Mit freundlichen Grüßen,
Anatoly Borodin
ose
between-git-and-command options often.
Merci!
--
Mit freundlichen Grüßen,
Anatoly Borodin
; of %d is bold
yellow.
The second line looks like this:
* %h, %s, %an with bold cyan;
* %h with bold yellow;
* %h with normal yellow and %s with normal white (default colors).
PS git version 2.9.2
--
Mit freundlichen Grüßen,
Anatoly Borodin
derr to stdout, but not to /dev/null. Something like
(git fetch blabla > /dev/null) 2>&1
(run `git fetch` in a subshell)...
--
Mit freundlichen Grüßen,
Anatoly Borodin
The following patch implements that behavior.
Thanks, the patch works great!
--
Mit freundlichen Grüßen,
Anatoly Borodin
example, `vim` says
Vim: Warning: Output is not to a terminal
and then becomes unusable (just as `vim | less` would be).
I think, the pagination should be turned off when the editor is being
called.
--
Mit freundlichen Grüßen,
Anatoly Borodin
t
effective.
`git -p -c core.editor=vim config -e` doesn't work and wants to be killed.
I've tested it on FreeBSD and Linux, have no idea, how it works on Mac or
Windows.
--
Mit freundlichen Grüßen,
Anatoly Borodin
/git-count-objects
--
Mit freundlichen Grüßen,
Anatoly Borodin
freundlichen Grüßen,
Anatoly Borodin
Hi Stefan,
this section was added to the manual in the commit
cddb42d2c58a9de9b2b5ef68817778e7afaace3e by "Jonathan Nieder"
6 years ago. Maybe he remembers better?
--
Mit freundlichen Grüßen,
Anatoly Borodin
t/t3411-rebase-preserve-around-merges.sh*
t/t3414-rebase-preserve-onto.sh*
--
Mit freundlichen Grüßen,
Anatoly Borodin
be there is more?
--
Mit freundlichen Grüßen,
Anatoly Borodin
?
--
Mit freundlichen Grüßen,
Anatoly Borodin
Hi René,
On Thu, Sep 29, 2016 at 8:13 PM, René Scharfe wrote:
> Reverts the change to t6006, so we'd need another test for this.
> Anatoly? :)
I've checked my example commands and couldn't find any regressions.
--
Mit freundlichen Grüßen,
Anatoly Borodin
Hi Ravi,
I've reported this one bug recently:
https://public-inbox.org/git/nrmbrl$hsk$1...@blaine.gmane.org/
The developers know about it, but it will require some deeper refactoring.
--
Mit freundlichen Grüßen,
Anatoly Borodin
mporary
names) and calls `meld` (or `vimdiff`, etc) with the file names as
parameters. So why wouldn't you call `meld` with the file names you
want?
--
Mit freundlichen Grüßen,
Anatoly Borodin
Hi All!
There are two bugs in `git filter-branch`, present in the most recent
versions (d10e2cb9d0299a26f43d57dd5bdcf2b3f86a30b3), as well as in the old
ones (I couldn't find a version where it works properly).
The script:
#!/bin/sh
set -e
GIT_EXEC_PATH=/tmp/git
export GIT_EXEC_PATH
GIT=$GIT_E
filter-branch should recommend
> "--branches --tags" instead of "--all", though.
Or redefine `--all` as "all refs excepting refs/replace/*". Who would
really want to run `--all` the way it works now?
The blobs replaces should be ignored, as in `git log --all`. Is ther
es present (use "git add" to track)
Without `--ignored`
--
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add ..." to include in what will be committed)
b
nothing added to commit but untracked files presen
uld be considered to be a bug in in the logic of
`git checkout-index`, or `git diff-index` / `git update-index`.
--
Mit freundlichen Grüßen,
Anatoly Borodin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
x27;t `git log` work like
that?
--
Mit freundlichen Grüßen,
Anatoly Borodin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
more branches '-m 3'
means 'the changes from 1 and 2'. Would it be possible to get only the
contribution from the second or third parent in this case?
Yeah, I know, there is `git diff parent1...parent3` etc, but not all the
changes from parent3 will always get to the merge commit
#x27;
where B' has the same tree as B.
This can of course be done with `git rebase --interactive` and marking
all commits for squash or fixup. But `git merge --squash` works with
not-fastforwarding feature branch, why should it refuse to work in a
fastforwarding case?
--
Mit freundlichen Grüßen,
Anatoly Borodin
Hi All,
I made a mistake in the previous message. I'm really sorry, I need to go
have some sleep right now.
Anatoly Borodin wrote:
> `git merge --squash --ff` will happily move the A ref to the B commit.
>
> But what I want, and expect, is:
>
> A---B'
>
27 matches
Mail list logo