Allows to disable the git blame optimization of assuming that if there is a
parent of a merge commit that has the exactly same file content, then
only this parent is to be looked at.
This optimization, while being faster in the usual case, means that in
the case of cherry-picks the blamed commit d
> In any case, adding value to the existing process is hard (because it
> works quite well!) and probably requires significantly more work to
> even understand what that value might look like. This, I think, is the
> key reason it is hard to truly get started with any bug tracking
> solution; the s
The "Everyday GIT With 20 Commands Or So" is not accessible via the
Git help system. Fix that.
Move everyday.txt to giteveryday.txt.
Update giteveryday.txt to fit man page formatting.
Add standard man page section titles.
Also adjust anchor text markup for man page format.
Add giteveryday to the m
frrr...@gmail.com wrote on Fri, 10 Jan 2014 18:18 +:
> The diff information render the spec file unusable as is by p4,
> do not include it when run with --prepare-p4-only so that the
> given file can be directly passed to p4.
Thanks for the patch, but I'm curious how you'd like this to
work.
From: Jeff King
This function checks a few different @{}-constructs. The
early part checks for and dispatches us to helpers for each
construct, but the code for handling @{upstream} is inline.
Let's factor this out into its own function. This makes
interpret_branch_name more readable, and will m
When a caller uses branch_get() to retrieve a "struct branch", they get
the per-branch remote name and a pointer to the remote struct. However,
they have no way of knowing about the per-branch pushremote from this
interface. So, let's expose that information via fields similar to
"remote" and "remo
Hi,
I'm getting ready to switch timezones in a few days, so the @{publish}
series is on hold for some time. In the meantime, I thought I'd send
in a few patches early.
[1/3] is a minor typo fix I happened to notice while writing tests.
[2/3] is an is an excellent patch by Peff, that greatly help
Signed-off-by: Ramkumar Ramachandra
---
t/t1507-rev-parse-upstream.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index 2a19e79..15f2e7e 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstrea
On Sun, Jan 12, 2014 at 12:59 PM, 乙酸鋰 wrote:
> Hi,
>
> Please cherry pick from msysgit/git
> commit 3c8cbb4edc8f577940c52115c992d17575587f99
>
> to synchronize git-credential-wincred
>
> This was the change they made half year ago.
It's actually a two-patch series.
Cover-letter:
http://permalink
Hi,
Please cherry pick from msysgit/git
commit 3c8cbb4edc8f577940c52115c992d17575587f99
to synchronize git-credential-wincred
This was the change they made half year ago.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More
Well... submodules didn't seem to fit the job, because it seems that the
sources of only one submodule at a time can be checked out.
And in my case, I would need to have the sources of all submodules
simultaneously.
I was talking about subtrees, because I thought it could be a better
tool for this
A new command is added to file watcher to send back the list of
updated files to git. These entries will have CE_WATCHED removed. The
remaining CE_WATCHED entries will have CE_VALID set (i.e. no changes
and no lstat either).
The file watcher keeps reporting the same "updated" list until it
receive
This will be used as signature to know if the index has changed.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
cache.h | 1 +
read-cache.c | 7 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cache.h b/cache.h
index ce377e1..7f7f306 100644
--- a/cache.h
+++ b/cache.h
@@ -27
If an entry is "watched", git lets an external program decide if the
entry is modified or not. It's more like --assume-unchanged, but
designed to be controlled by machine.
We are running out of on-disk ce_flags, so instead of extending
on-disk entry format again, "watched" flags are in-core only a
It's been 37 weeks since Robert Zeh's attempt to bring inotify support
to Git [1] and unless I missed some mails, no updates since. So here's
another attempt with my preferred approach (can't help it, playing
with your own ideas is more fun than improving other people's code)
To compare to Robert'
We want to watch files that are never changed because lstat() on those
files is a wasted effort. So we sort unwatched files by date and start
adding them to the file watcher until it barfs (e.g. hits inotify
limit). Recently updated entries are also excluded from watch list.
CE_VALID is used in com
This patch establishes a connection between a new file watcher daemon
and git. Each index file may have at most one file watcher attached to
it. The file watcher maintains a UNIX socket at
$GIT_DIR/index.watcher. Any process that has write access to $GIT_DIR
can talk to the file watcher.
A validat
"git diff" on webkit:
no file watcher 1st run subsequent runs
real0m1.361s0m1.445s 0m0.691s
user0m0.889s0m0.940s 0m0.649s
sys 0m0.469s0m0.495s 0m0.040s
Signed-off-by: Nguyễn Thái Ngọc Duy
---
config.mak.uname | 1 +
file-watcher.c
On 2014-01-12 01.23, THILLOSEN Andreas wrote:
> Hi,
>
> I have a question about a specific use case for subtrees, but I'm not
I feel a little bit confused: Are you talking about git submodules?
And you may want to have a look at the repo tool:
https://code.google.com/p/git-repo/
HTH
/Torsten
-
Kevin wrote:
> Either the documentation is wrong, and should be changed to "th
> branch/commit checkout out before the current one", or the behavior of
> @{-1} is wrong.
Yeah, the documentation needs to be updated. Patches welcome.
--
To unsubscribe from this list: send the line "unsubscribe git"
20 matches
Mail list logo
