]> git.ipfire.org Git - thirdparty/patchwork.git/commit
projects / thirdparty / patchwork.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6cf9468) | patch
pwclient: support 3-way merge
authorMatthias Brugger <mbrugger@suse.com>
Tue, 20 Dec 2016 10:49:38 +0000 (11:49 +0100)
committerStephen Finucane <stephen@that.guru>
Fri, 23 Dec 2016 23:12:58 +0000 (23:12 +0000)
commitd2d5b4f1a6f6b251bd822c3e59cda1b7bec9104f
tree7a1ec5355fe532c465ffef3a265d06f909843631tree | snapshot
parent6cf9468870936c7ee8229208e50ff16c85faab3fcommit | diff
pwclient: support 3-way merge

Add support for the 3-way merge in git-am.
This can be done via
  - the commandline
  - the global option section
  - the per-project section

Signed-off-by: Matthias Brugger <mbrugger@suse.com>
Reviewed-by: Stephen Finucane <stephen@that.guru>
patchwork/bin/pwclient diff | blob | blame | history
Mirror of https://github.com/getpatchwork/patchwork.git