Questions tagged [git-am]

Git command for applying a series of patches from a mailbox.

37 questions
0
votes
1 answer

Apply series of patches using specific patch number

I have set of patches, for e.g as below. 0001-first-commit.patch 0002-second-commit.patch 0003-third-commit.patch 0004-4th-commit.patch 0005-fifth-commit.patch What is the best way to apply patches from given patch number up to end. I mean can we…
SD.
  • 1,212
  • 15
  • 32
0
votes
2 answers

git am: Patch format detection failed. git apply also fails

I'm trying to learn git patching, so I set up a test repo and made a few commits. I then created a patch: git format-patch -1 HEAD --stdout > changes.patch Next, I checked out a new branch and tried to use changes.patch: git am .\changes.patch. It…
Danation
  • 656
  • 8
  • 18
0
votes
1 answer

Does git am some_patch apply in an atomic way?

I have written an automated code to apply git patches via git python library. However I want to know is there a possibility that some of the patches are applied and some give error. try: repo.git.execute(["git", "am", "patch") except…
sky
  • 187
  • 2
  • 10
0
votes
0 answers

Unwanted stuff written in file when cherry-picked

Recently I got to know about cherry-pick command in git, and it turns out to be a useful command. I learnt from the resources on how to use it to cherry-pick contents from other's repo. After I used the command, the contents got cherry-picked from…
user8215542
0
votes
1 answer

How to merge two patches(git log) of different repository

I have a use case where I wanted to merge some sub directories of two repositories in a new repo. For this, I have created patch for both the repositories for the directories I need using git log --pretty=email --patch-with-stat --reverse…
Anuj Khandelwal
  • 785
  • 2
  • 10
  • 28
0
votes
1 answer

Troubles with git am when applied in a different repository

I have two Git repositories: /api/pom.xml /jpa/pom.xml /mailbox/api/pom.xml /mailbox/jpa/pom.xml /protocols/api/pom.xml The second repository have a mailbox folder that has the exact same structure that the first Git repository. Due to workflow…
Benwa
  • 91
  • 4
0
votes
1 answer

Is it possible to accept pull request from a cloned/forked repo?

Is it possible to accept pull request from a cloned repo? Example ( fork of repo ): Repo #1: https://github.com/acme/original_project Repo #2: https://github.com/blah/original_project ( fork ) Pull Request Limbo: Repo #1 has new pull request but…
Phill Pafford
  • 77,927
  • 86
  • 256
  • 378
1 2
3