Re: --skip-worktree and operations like checkout / stash /etc.

nored[@]}"; do git update-index --skip-worktree -- "$x" done Regards, Raman On Thu, Sep 27, 2018 at 6:29 PM Raman Gupta wrote: > > The comand `update-index --skip-worktree` seems to be an ideal way to > tell git to locally ignore some modified files. However, this seems

--skip-worktree and operations like checkout / stash /etc.

The comand `update-index --skip-worktree` seems to be an ideal way to tell git to locally ignore some modified files. However, this seems not to play well with very common commands like `checkout` and `stash`. $ git checkout other-branch error: Your local changes to the following files would be ov

Created an open source repo for gitworkflow

As one step towards raising awareness in the developer community and making "gitworkflow" [1] more accessible, I am creating a home for gitworkflow on GitHub: https://github.com/rocketraman/gitworkflow My intention with this repository is to have a central place in which to write and collect read

Re: [PATCH v2] contrib/rerere-train: optionally overwrite existing resolutions

On 26/07/17 04:41 PM, Junio C Hamano wrote: > Raman Gupta writes: > >> On 26/07/17 02:05 PM, Junio C Hamano wrote: >>> I haven't tried this patch, but would this work well with options >>> meant for the 'git rev-list --parents "$@"' that

[PATCH v3] contrib/rerere-train: optionally overwrite existing resolutions

script. Signed-off-by: Raman Gupta --- contrib/rerere-train.sh | 54 +++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh index 52ad9e4..45d 100755 --- a/contrib/rerere-train.sh

Re: [PATCH v2] contrib/rerere-train: optionally overwrite existing resolutions

On 26/07/17 02:05 PM, Junio C Hamano wrote: > I haven't tried this patch, but would this work well with options > meant for the 'git rev-list --parents "$@"' that grabs the list of > merge commits to learn from? e.g. > > $ contrib/rerere-train.sh -n 4 --merges master > $ contrib/rerer

[PATCH v2] contrib/rerere-train: optionally overwrite existing resolutions

script. Signed-off-by: Raman Gupta --- contrib/rerere-train.sh | 36 ++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh index 52ad9e4..e25bf8a 100755 --- a/contrib/rerere-train.sh +++ b/contrib

Re: [RFC] Git rerere and non-conflicting changes during conflict resolution

On 25/07/17 01:52 PM, Jeff King wrote: > On Tue, Jul 25, 2017 at 11:09:55AM -0400, Raman Gupta wrote: > >> I had an interesting situation today: resolving a merge conflict >> required modification in other files that were not themselves conflicting. >> >> I just

[RFC] Git rerere and non-conflicting changes during conflict resolution

I had an interesting situation today: resolving a merge conflict required modification in other files that were not themselves conflicting. I just realized that rerere does not remember any changes to these additional files -- only changes to the conflicting files. This makes the end result of rer

[PATCH/RFC] contrib: rerere-train overwrites existing resolutions

>From 41116889f7eb2ddd590d165d9ca89646f7b15aaf Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Tue, 25 Jul 2017 10:28:35 -0400 Subject: [PATCH] contrib: rerere-train overwrites existing resolutions When running rerere-train, the user is explicitly asking the training to occur based on

Re: Article on the branch strategy in gitworkflows(7)

FYI - the article mentioned below has been published @ https://medium.com/@ramangupta/how-the-creators-of-git-do-branches-e6fcc57270fb Thank you to the two or three people that I know of that took the time to read the draft. Regards, Raman On 22/03/17 12:41 PM, Raman Gupta wrote: > Seve

Article on the branch strategy in gitworkflows(7)

06b0e4eb7789f043 [2] http://nvie.com/posts/a-successful-git-branching-model/ [3] http://nvie.com/img/git-mo...@2x.png Regards, Raman Gupta