Questions tagged [git-patch]
108 questions
0
votes
0 answers
Git patch and calculate SHA
To avoid XY I will explain my goal:
I am writing a RunManager which should execute a process of given version. I want to add an option to run the process with the current directory contents (including uncommitted changes), and tag those changes…
Elad Weiss
- 3,662
- 3
- 22
- 50
0
votes
1 answer
Is it possible to replace files from different commits in git with a "unified" patch?
I have a git repository with different tags/commits and I want to replace a Makefile (it is different in each version).
In all these versions with my own Makefile.
Is it possible to write only one patch-file that can be applied to all of these…
sirloin
- 33
- 2
0
votes
1 answer
git - Saving My Committed Work and Applying it to New and Fresh Clone of Repo
I was working on some functionality on my-branch and I have to stop and move on but the work on my-branch is not completed and another developer will take it ower.
I also dont want to push my-branch work to remote yet. Just want to be able to…
cd491415
- 823
- 2
- 14
- 33
0
votes
1 answer
How to apply a git patch without recreating the original structure where it was made
I'm trying to apply this patch to a file (bi_janrain_data/js/bi_janrain_data.js):
# This patch file was generated by NetBeans IDE
# It uses platform neutral UTF-8 encoding and \n newlines.
--- a/bi_janrain_data.js (Dec 28, 2017 12:15:26…
JorgeeFG
- 5,651
- 12
- 59
- 92
0
votes
1 answer
Git and add -p problems
I have just applied a patch to 3 files, their diff can be seen here:
stack.h, stack.c and main.c.
The task is to separate the patch into various commits, like comments, license, refactoring etc.
For that I will use git add -p:
First hunk is license…
Hichigaya Hachiman
- 193
- 2
- 14
0
votes
3 answers
Change direction of git merge (after the merge is done)
I have a branch (e.g. Feature-X) in a git repo.
What I did was the following
git checkout master
git merge Feature-X
There were quite a few conflicts which I resolved. I haven't committed the changes yet.
But, it turns out what I wanted was to do…
George Kastrinis
- 4,924
- 4
- 29
- 46
0
votes
1 answer
how to re patch a theme after new version using git
I am using a theme for 3 years.
I have patched it a little for myself.
After dreamhost stopped php 5.6, I have to update to the new version.
I have already been using git from day 1.
Can you suggest how git help in re applying the same changes…
thevikas
- 1,618
- 1
- 14
- 31
0
votes
1 answer
Staging a renamed attribute using hunk edit mode
I'm trying to use 'git add -p' to commit only a part of my code. In the diff below I want to rename 'model' to 'sharedData' (thus, removing the model line and adding the sharedData-line).
@@ -58,9 +60,11 @@
`
})
export class…
Jonas Möller
- 363
- 3
- 16
0
votes
0 answers
Receiving "patch failed" and "patch does not apply" errors after running "git add -e"
I can't seem to run "git add -e" in either Powershell or Git Bash without getting errors. Here are the file (test3.html) contents in question:
test
Hello
Note that…
user6312047
0
votes
2 answers
Creating patch from git repository interactivelly
I have a repository where I have a commit I would like to publish as a patch to an open source project. The problem is that some parts of that commit have debugging information I need and want to keep for myself, but represent clutter to this public…
Paulo Neves
- 1,096
- 14
- 22
0
votes
0 answers
Apply patch with merge
Let's say I've created a patch from 6 commits in app A & I want to apply this patch in app B.
If I try and apply the patch, git wil complain because the naming is different or the files do not exist yet.
Is it possible to apply a patch and
create…
Vincent
- 6,058
- 15
- 52
- 94
0
votes
1 answer
Build Approaches for patches using Git
I am new to Git and I have to setup the build process for my account
For full builds I can do git clone
However for 'patch builds' I need to 'pull' the last known good code + code changed for that patch
Example
a.c v1.0 - full build
a.c v1.1 -…
Sathish Kumar
- 2,150
- 10
- 29
- 51
0
votes
1 answer
How do I merge multiple patches with git?
I have several patches that I need to merge into my branch
The guide line for this was:
git checkout 4.4
git checkout -b 4.4-xamarin
git am Engine/Plugins/XamarinUE4/Patches/*
In Patches are 33 different patches, the problem that I have is that git…
Maik Klein
- 15,548
- 27
- 101
- 197
0
votes
1 answer
git patch will not apply, faild on: .idea/workspace.xml
I'm new to git and already in love with it.
so I'm doing lots of projects in PHP using PhpStorm,
I got my own framework that I developing, And now thanks to git I can control versions in my system.
My problem is that I made some core changes on one…
Fadey
- 430
- 2
- 11
0
votes
1 answer
can I submit a request for a bug-fix with a 'pull-and-patch' on Github?
I encountered a bug in a project repo hosted on Github, so I logged it as an issue, in response to which the project maintainer asked me to "make a pull request with a patch" and closed the issue.
Does this mean I am to fix the issue (the 'patch')…
gallygator
- 377
- 1
- 4
- 16