On Tue, May 17, 2016 at 3:42 AM, Junio C Hamano <gits...@pobox.com> wrote: > > Karthik Nayak <karthik....@gmail.com> writes: > > > This is part of unification of the commands 'git tag -l, git branch -l > > and git for-each-ref'. This ports over branch.c to use ref-filter's > > printing options. > > > > Initially posted here: $(gmane/279226). It was decided that this series > > would follow up after refactoring ref-filter parsing mechanism, which > > is now merged into master (9606218b32344c5c756f7c29349d3845ef60b80c). > > 9606218b? >
I believe it should be 50cd83dca100174ba95baa9f6ed8426bce731ac2 > > > Changes in this version: > > > > 1. Rebased on top of f307218 (t6302: simplify non-gpg cases). > > > $ git checkout f307218 > $ git am 0001-ref-filter-implement-if.txt > Applying: ref-filter: implement %(if), %(then), and %(else) atoms > error: patch failed: Documentation/git-for-each-ref.txt:181 > error: Documentation/git-for-each-ref.txt: patch does not apply > Patch failed at 0001 ref-filter: implement %(if), %(then), and %(else) atoms > The copy of the patch that failed is found in: .git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". Hello, sorry for the confusion, it's built on top of 'next' which contains f307218 (t6302: simplify non-gpg cases). The merge conflict is due to the commit made by you 1cca17df (Documentation: fix linkgit references). -- Regards, Karthik -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
