Re: [feature request] find git commit log before rebase

2016-05-26 Thread Sebastian Staudt
Hi. I think what you want is `git reflog` (http://git-scm.com/man/reflog). git reflog b Will tell you the commits b pointed to in the past. Best regards, Sebastian 2016-05-26 18:55 GMT+02:00 ryenus : > Assuming I have branches master (m), and a side branch (b), with a > history tree like b

[PATCH 1/2] Add tests for describe with --work-tree

2019-01-26 Thread Sebastian Staudt
The dirty ones are already passing, but just because describe is comparing with the wrong working tree. Signed-off-by: Sebastian Staudt --- t/t6120-describe.sh | 24 1 file changed, 24 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index

[PATCH 2/2] Setup working tree in describe

2019-01-26 Thread Sebastian Staudt
This ensures the given working tree is used for --dirty and --broken. Signed-off-by: Sebastian Staudt --- builtin/describe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/describe.c b/builtin/describe.c index cc118448ee..ba1a0b199b 100644 --- a/builtin/describe.c +++ b/builtin

Re: [PATCH 2/2] Setup working tree in describe

2019-01-26 Thread Sebastian Staudt
Am Sa., 26. Jan. 2019 um 12:01 Uhr schrieb Duy Nguyen : > > On Sat, Jan 26, 2019 at 5:44 PM Sebastian Staudt wrote: > > > > This ensures the given working tree is used for --dirty and --broken. > > > > Signed-off-by: Sebastian Staudt > > --- > > builti

[PATCH v2 3/3] Add test for describe with a bare repository

2019-01-26 Thread Sebastian Staudt
This ensures that nothing breaks the basic functionality of describe for bare repositories. Please note that --broken and --dirty need a working tree. Signed-off-by: Sebastian Staudt --- t/t6120-describe.sh | 7 +++ 1 file changed, 7 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120

[PATCH v2 1/3] Add tests for describe with --work-tree

2019-01-26 Thread Sebastian Staudt
The dirty ones are already passing, but just because describe is comparing with the wrong working tree. Signed-off-by: Sebastian Staudt --- t/t6120-describe.sh | 24 1 file changed, 24 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index

[PATCH v2 2/3] Setup working tree in describe

2019-01-26 Thread Sebastian Staudt
This ensures the given working tree is used for --dirty. The implementation of --broken uses diff-index which calls setup_work_tree() itself. Signed-off-by: Sebastian Staudt --- builtin/describe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/describe.c b/builtin/describe.c index

Re: [PATCH v2 3/3] Add test for describe with a bare repository

2019-01-26 Thread Sebastian Staudt
Am So., 27. Jan. 2019 um 01:25 Uhr schrieb Duy Nguyen : > > On Sun, Jan 27, 2019 at 3:51 AM Sebastian Staudt wrote: > > > > This ensures that nothing breaks the basic functionality of describe for > > bare repositories. Please note that --broken and --dirty need a working

Re: [PATCH v2 1/3] Add tests for describe with --work-tree

2019-01-26 Thread Sebastian Staudt
Am So., 27. Jan. 2019 um 01:07 Uhr schrieb Duy Nguyen : > > On Sun, Jan 27, 2019 at 3:51 AM Sebastian Staudt wrote: > > > > The dirty ones are already passing, but just because describe is comparing > > with the wrong working tree. > > > > Signed-off-by: Se

Re: [PATCH v2 2/3] Setup working tree in describe

2019-01-26 Thread Sebastian Staudt
Am So., 27. Jan. 2019 um 01:22 Uhr schrieb Duy Nguyen : > > On Sun, Jan 27, 2019 at 3:51 AM Sebastian Staudt wrote: > > > > This ensures the given working tree is used for --dirty. > > > > The implementation of --broken uses diff-index which calls > > setup

[PATCH v3 1/3] Add tests for describe with --work-tree

2019-01-28 Thread Sebastian Staudt
The dirty ones are already passing, but just because describe is comparing with the wrong working tree. Signed-off-by: Sebastian Staudt --- t/t6120-describe.sh | 33 + 1 file changed, 33 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index

[PATCH v3 2/3] Setup working tree in describe

2019-01-28 Thread Sebastian Staudt
This ensures the given working tree is used for --dirty. The implementation of --broken uses diff-index which calls setup_work_tree() itself. Signed-off-by: Sebastian Staudt --- builtin/describe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/describe.c b/builtin/describe.c index

[PATCH v3 3/3] Add test for describe with a bare repository

2019-01-28 Thread Sebastian Staudt
This ensures that nothing breaks the basic functionality of describe for bare repositories. Please note that --broken and --dirty need a working tree. Signed-off-by: Sebastian Staudt --- t/t6120-describe.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120

Re: [PATCH v3 1/3] Add tests for describe with --work-tree

2019-01-30 Thread Sebastian Staudt
Am Di., 29. Jan. 2019 um 18:47 Uhr schrieb Junio C Hamano : > > Jeff King writes: > > > The usual style is to put the whole snippet into single-quotes, and then > > double-quote as appropriate within it. Like: > > > > test_expect_failure 'describe --dirty with --work-tree' ' > > ( > >

Re: [PATCH v3 3/3] Add test for describe with a bare repository

2019-01-30 Thread Sebastian Staudt
Am Di., 29. Jan. 2019 um 14:12 Uhr schrieb Jeff King : > > On Tue, Jan 29, 2019 at 06:18:59AM +0100, Sebastian Staudt wrote: > > > This ensures that nothing breaks the basic functionality of describe for > > bare repositories. Please note that --broken and --dirty ne

Re: [PATCH v3 2/3] Setup working tree in describe

2019-01-30 Thread Sebastian Staudt
Am Di., 29. Jan. 2019 um 23:35 Uhr schrieb Jeff King : > > On Tue, Jan 29, 2019 at 03:53:40PM -0500, Eric Sunshine wrote: > > > > > The implementation of --broken uses diff-index which calls > > > > setup_work_tree() itself. > > > > > > If I hadn't just read the rest of the thread, I'd probably won

[PATCH v4 1/2] describe: setup working tree for --dirty

2019-02-01 Thread Sebastian Staudt
it-diff-index we don‘t have to setup the working tree in the git-describe process. Signed-off-by: Sebastian Staudt Helped-by: Jeff King --- builtin/describe.c | 1 + t/t6120-describe.sh | 33 + 2 files changed, 34 insertions(+) diff --git a/builtin/describ

[PATCH v4 2/2] t6120: test for describe with a bare repository

2019-02-01 Thread Sebastian Staudt
This ensures that nothing breaks the basic functionality of describe for bare repositories. Please note that --broken and --dirty need a working tree. Signed-off-by: Sebastian Staudt --- t/t6120-describe.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120

Re: [PATCH v4 2/2] t6120: test for describe with a bare repository

2019-02-02 Thread Sebastian Staudt
Am Fr., 1. Feb. 2019 um 19:53 Uhr schrieb Junio C Hamano : > > Sebastian Staudt writes: > > > This ensures that nothing breaks the basic functionality of describe for > > bare repositories. Please note that --broken and --dirty need a working > > tree. > > &g

Re: [PATCH v4 1/2] describe: setup working tree for --dirty

2019-02-02 Thread Sebastian Staudt
Am Fr., 1. Feb. 2019 um 21:12 Uhr schrieb Eric Sunshine : > > On Fri, Feb 1, 2019 at 8:55 AM Sebastian Staudt wrote: > > We don't use NEED_WORK_TREE when running the git-describe builtin, > > since you should be able to describe a commit even in a bare repository. > &

[PATCH v5 2/2] t6120: test for describe with a bare repository

2019-02-02 Thread Sebastian Staudt
This ensures that nothing breaks the basic functionality of describe for bare repositories. Please note that --broken and --dirty need a working tree. Signed-off-by: Sebastian Staudt --- t/t6120-describe.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t6120-describe.sh b/t/t6120

[PATCH v5 1/2] describe: setup working tree for --dirty

2019-02-02 Thread Sebastian Staudt
it-diff-index we don‘t have to setup the working tree in the git-describe process. Signed-off-by: Sebastian Staudt Helped-by: Jeff King --- builtin/describe.c | 1 + t/t6120-describe.sh | 33 + 2 files changed, 34 insertions(+) diff --git a/builtin/describ

[PATCH] travis-ci: no longer use containers

2018-10-25 Thread Sebastian Staudt
Travis CI will soon deprecate the container-based infrastructure enabled by `sudo: false` in ce59dffb34190e780be2fa9f449f842cadee9753. More info: https://blog.travis-ci.com/2018-10-04-combining-linux-infrastructures Signed-off-by: Sebastian Staudt --- .travis.yml | 2 -- 1 file changed, 2

Re: [PATCH] travis-ci: no longer use containers

2018-10-25 Thread Sebastian Staudt
Junio C Hamano writes: > > Sebastian Staudt writes: > > > Travis CI will soon deprecate the container-based infrastructure > > enabled by `sudo: false` in ce59dffb34190e780be2fa9f449f842cadee9753. > > > > More info: > > https://blog.travis-ci.com/201

Re: [RFC] checkout --rebase

2013-07-19 Thread Sebastian Staudt
Isn't this what you want? $ git rebase master um-build 2013/7/19 Ramkumar Ramachandra : > Hi, > > I'm often work on small topic branches, and find myself doing this quite > often: > > # on branch master > $ git checkout um-build > $ git rebase master > > This is horribly inefficient; the

[PATCH] config.txt: Document help.htmlpath config parameter

2013-01-15 Thread Sebastian Staudt
Signed-off-by: Sebastian Staudt --- Documentation/config.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index bf8f911..e452ff8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1351,6 +1351,12

[ANN] Mestral – Hook management for Git

2013-05-11 Thread Sebastian Staudt
Hi, today I'd like to introduce a new tool to manage Git hooks. It's called Mestral and is available at GitHub: https://github.com/mestral/mestral It is written in Ruby and inspired by Homebrew (http://brew.sh). It uses Git itself to load and update hooks and aims to be easy to use for both users

Re: Anybody know a website with up-to-date git documentation?

2013-01-30 Thread Sebastian Staudt
Hello Max, git-scm.com is the best source and it's not outdated. It gets an update after every single release of Git. See e.g. http://git-scm.com/docs/git-config which was updated in the current stable version. It seems that git-remote-helper's documentation was just not updated since version 1.7.

Re: Anybody know a website with up-to-date git documentation?

2013-01-30 Thread Sebastian Staudt
apart from the locally installed HTML version. Best regards, Sebastian 2013/1/30 Max Horn : > Hi Sebastian, > > On 30.01.2013, at 12:56, Sebastian Staudt wrote: > >> Hello Max, >> >> git-scm.com is the best source and it's not outdated. > > Then it se