Am 7/19/2012 23:20, schrieb Alexey Muranov:
On 19 Jul 2012, at 19:34, Konstantin Khomoutov wrote:
On Thu, 19 Jul 2012 18:21:21 +0200 Alexey Muranov
alexey.mura...@gmail.com wrote:
[...]
I do not still understand very well some aspects of Git, like the
exact purpose of remote tracking
Am 7/18/2012 9:27, schrieb Martin von Zweigbergk:
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 37c1b23..fe3fdd1 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -16,11 +16,9 @@ skip)
;;
esac
-test -n $rebase_root root_flag=--root
test -n $keep_empty
On 07/19/2012 11:33 PM, Jeff King wrote:
[...]
This cannot be done by simply leaving the reflog files in
place. The ref namespace does not allow D/F conflicts, so a
ref foo would block the creation of another ref foo/bar,
and vice versa. This limitation is acceptable for two refs
to exist
On Tue, Jul 17, 2012 at 8:31 PM, Ævar Arnfjörð Bjarmason
ava...@gmail.com wrote:
Nice, I thought about doing something like this myself but never had the time.
Thanks. Took quite some time to take out the Git-specific
functionality. And there's still a lot of room for improvement.
Perhaps to
Mathias Lafeldt mathias.lafe...@gmail.com writes:
On Tue, Jul 17, 2012 at 8:31 PM, Ævar Arnfjörð Bjarmason
ava...@gmail.com wrote:
Perhaps to avoid duplication we could move to this and keep
Git-specific function in some other file.
That would be fantastic! From a technical point of view,
On Thu, Jul 19, 2012 at 03:36:09PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
Only one test needed to be updated; t7701 tries to create
unreachable objects by deleting branches. Of course that no
longer works, which is the intent of this patch. The test
now works
On Fri, Jul 20, 2012 at 10:43:37AM -0400, Jeff King wrote:
I think the work-around indicates the need for regular users to be
able to also discover, prune and delete these logs. Do we have
prune reflog for _this_ ref (or these refs), removing entries that
are older than this threshold?
Hi,
How can I push a working branch to github inside it?
E.g:
# On master:
$ git checkout -b feature-work
# On feature-work
# vi, hack, commit, ready to push
$ git push origin master # here I expected it would working pushing my
commits to a feature-work branch in github. Or if I omit master
Jeff King p...@peff.net writes:
I noticed I ignored the discover and delete parts of your paragraph.
As far as deletion goes, I think we can ignore it; expiring all entries
is equivalent.
...
In other words, I want to focus on getting the ref-level plumbing right,
and then we can care about
Jeff King p...@peff.net writes:
But it would mean that you cannot naively run
echo $sha1 .git/refs/heads/foo
anymore. I suspect that the packed-refs conversion rooted out many
scripts that did not use update-ref and rev-parse to access refs, but
the above does still work today. So I
Thiago Farina tfrans...@gmail.com writes:
How can I push a working branch to github inside it?
E.g:
# On master:
$ git checkout -b feature-work
# On feature-work
# vi, hack, commit, ready to push
$ git push origin master # here I expected it would working pushing my
git push origin
On Fri, Jul 20, 2012 at 8:26 AM, Thiago Farina tfrans...@gmail.com wrote:
Hi,
How can I push a working branch to github inside it?
E.g:
# On master:
$ git checkout -b feature-work
# On feature-work
# vi, hack, commit, ready to push
$ git push origin master # here I expected it would
Thanks for reviewing.
On Fri, Jul 20, 2012 at 1:14 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 7/18/2012 9:27, schrieb Martin von Zweigbergk:
@@ -814,7 +814,8 @@ add_pick_line () {
else
comment_out=
fi
- printf '%s\n' ${comment_out}pick $1 $2 $todo
+
On Fri, 20 Jul 2012 12:26:09 -0300
Thiago Farina tfrans...@gmail.com wrote:
How can I push a working branch to github inside it?
E.g:
# On master:
$ git checkout -b feature-work
# On feature-work
# vi, hack, commit, ready to push
$ git push origin master # here I expected it would
On Fri, Jul 20, 2012 at 12:46 PM, Junio C Hamano gits...@pobox.com wrote:
Thiago Farina tfrans...@gmail.com writes:
How can I push a working branch to github inside it?
E.g:
# On master:
$ git checkout -b feature-work
# On feature-work
# vi, hack, commit, ready to push
$ git push
On Fri, Jul 20, 2012 at 08:42:57AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
But it would mean that you cannot naively run
echo $sha1 .git/refs/heads/foo
anymore. I suspect that the packed-refs conversion rooted out many
scripts that did not use update-ref and
Thiago Farina tfrans...@gmail.com writes:
$ git push origin master # here I expected it would working pushing my
commits to a feature-work branch in github. Or if I omit master it
gives me a [rejected] error.
Everything up-to-date.
If your workflow is to push one branch at a time, and you
On Fri, Jul 20, 2012 at 1:18 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 7/18/2012 9:27, schrieb Martin von Zweigbergk:
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 37c1b23..fe3fdd1 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -16,11 +16,9 @@ skip)
;;
Am 20.07.2012 11:49, schrieb Michael Haggerty:
Other possibilities (according to git-check-ref-format(1)):
refs/.heads/.a/.b/c
refs/heads./a./b./c (problematic on some Windows filesystems?)
Yes. Probably all filesystems.
refs/heads../a../b../c
Same here.
Am 20.07.2012 17:44, schrieb Jeff King:
So I think a suffix like :d is probably the least horrible.
Not so. It does not work on Windows :-( in the expected way. Trying to
open a file with a colon-separated suffix either opens a resource fork
on NTFS or fails with invalid path.
-- Hannes
--
To
On Fri, Jul 20, 2012 at 06:37:02PM +0200, Johannes Sixt wrote:
Am 20.07.2012 17:44, schrieb Jeff King:
So I think a suffix like :d is probably the least horrible.
Not so. It does not work on Windows :-( in the expected way. Trying to
open a file with a colon-separated suffix either opens a
I use git for many things, but I am trying to work out the workflow to use git
for deployment. I have a wordpress site that i need to track multiple branches
of and it has many many resource files, images, video, etc... how can i
streamline the performance. ive read about git-annex and also
Matthieu Moy matthieu@grenoble-inp.fr writes:
OTOH, having it leave in a subdirectory (e.g. $git/t/Sharness/), and
synchronize with stg like subtree merge would be nice for the user. We
already have something similar for gitk and git-gui, except that the
synchronization is normally one
The REUC extension stores the stage 1/2/3 data of entries which were
marked resolved by the user, to enable 'git checkout -m name' to
restore the conflicted state later.
When a file was deleted on one side of the merge and unmodified on the
other, merge-recursive uses remove_file_from_cache() to
Thomas Rast tr...@student.ethz.ch writes:
Thomas and me discovered this while hacking on index-v5. It would be
a bit tricky to handle there: the index is structured according to the
directory layout of the files it contains, and the REUC data is the
same as the conflict (stages) data plus a
Darek == Darek Bridges darek.brid...@me.com writes:
Darek I use git for many things, but I am trying to work out the
Darek workflow to use git for deployment.
Don't.
--
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
mer...@stonehenge.com
On Fri, Jul 20, 2012 at 6:54 PM, Randal L. Schwartz
mer...@stonehenge.com wrote:
Darek == Darek Bridges darek.brid...@me.com writes:
Darek I use git for many things, but I am trying to work out the
Darek workflow to use git for deployment.
Don't.
Heh. Best to keep in mind that it just
Hi Michael,
I've fixed the git-svn tests for SVN 1.7 and tested with SVN 1.7.5.
Thanks. git-svn is not maintained by Junio but by Eric and others on
the list. I'm cc-ing Eric and Ben Walton so they can benefit from
your work.
This is fantastic. It's been on my todo list but not a
On Fri, Jul 20, 2012 at 4:19 PM, PJ Weisberg
p...@irregularexpressions.net wrote:
On Fri, Jul 20, 2012 at 8:49 AM, Thiago Farina tfrans...@gmail.com wrote:
What I'm looking for is to upload/create the remote branch in github
from inside my local branch, without having to checkout master in
On Fri, Jul 20, 2012 at 6:40 PM, Thiago Farina tfrans...@gmail.com wrote:
On Fri, Jul 20, 2012 at 4:19 PM, PJ Weisberg
p...@irregularexpressions.net wrote:
On Fri, Jul 20, 2012 at 8:49 AM, Thiago Farina tfrans...@gmail.com wrote:
What I'm looking for is to upload/create the remote branch in
On Thu, Jul 19, 2012 at 10:34 AM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
Perhaps something like this...
Yeah, like that ;-).
Hmm.. this one was potentially data-losing. Sorry for not catching
that in 7e0abcec103b3649943b236881cf88e8fd6cf3a4.
$ git
31 matches
Mail list logo
