Questions tagged [git-am]

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

39 questions
1
vote
1 answer

Using Git am when outlook is involved

I am using linux in a virtual machine but my host is windows with outlook installed. Currently when I receive emails containing git patches they pop up in my outlook. How do I apply these patches? They are not sent as attachments, they are sent…
chrispepper1989
  • 2,100
  • 2
  • 23
  • 48
1
vote
1 answer

Reset "branch ahead" when using a bundle

In my current workflow, I get a git bundle, which I unpack: $ git bundle unpack new.bundle code and then I add patches to it: $ git am *.patch git log shows that the patches were committed; however, when I run git status, it says Your branch is…
kirill_igum
  • 3,953
  • 5
  • 47
  • 73
0
votes
0 answers

Create patch or diff file from git repository for target directory and apply it to another different git repository with different directory

Here is similar question. git format-patch -k R1..R2 But I want only commits from current directory and removing relative path or change path at all For example by doing: git format-patch -k R1..R2 . I get patches with…
Eugen Konkov
  • 22,193
  • 17
  • 108
  • 158
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,432
  • 22
  • 38
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
  • 743
  • 8
  • 20
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
  • 835
  • 2
  • 15
  • 31
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
  • 83,471
  • 91
  • 263
  • 383
1 2
3