git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 0/4] make pull.ff=true override merge.ff

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 14, 2015, 12:59 UTC
Message-ID
<f80d59c142b64c56fe7159452d4d10e3@www.dscho.org>
In-Reply-To
<1431510740-9710-1-git-send-email-pyokagan@gmail.com>
Hi Paul,
On 2015-05-13 11:52, Paul Tan wrote:
Show 14 quoted lines
> Since b814da8 (pull: add pull.ff configuration, 2014-01-15), running
> git-pull with the configuration pull.ff=false or pull.ff=only is
> equivalent to passing --no-ff and --ff-only to git-merge. However, if
> pull.ff=true, no switch is passed to git-merge. This leads to the
> confusing behavior where pull.ff=false or pull.ff=only is able to
> override merge.ff, while pull.ff=true is unable to.
> 
> This patch series adds a failing test to demonstrates the above, and fixes it.
> 
> The documentation is also tweaked to clarify that pull.ff is meant to override
> merge.ff.
> 
> The last patch makes pull.ff consistent with merge.ff by supporting the config
> aliases of true and false (on, off, 0, 1).
Looks very good!
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Ciao, Dscho

Previous: Paul Tan
Message 17 of 17 in “make pull.ff=true override merge.ff”
  1. 0/4 make pull.ff=true override merge.ffPaul Tan, May 13, 2015
  2. 1/4 t7601: test for pull.ff=true overrides merge.ff=falsePaul Tan, May 13, 2015
  3. Johannes SchindelinMay 14, 2015
  4. Junio C HamanoMay 14, 2015
  5. sh -x -i -v with continuous integration, was Re: [PATCH 1/4] t7601: test for pull.ff=true overrides merge.ff=falseJohannes Schindelin, May 14, 2015
  6. Junio C HamanoMay 14, 2015
  7. Jeff KingMay 16, 2015
  8. Junio C HamanoMay 16, 2015
  9. Jeff KingMay 18, 2015
  10. Junio C HamanoMay 18, 2015
  11. Jeff KingMay 18, 2015
  12. Junio C HamanoMay 18, 2015
  13. Paul TanMay 16, 2015
  14. 2/4 pull: make pull.ff=true override merge.ffPaul Tan, May 13, 2015
  15. 3/4 Documentation/config.txt: clarify that pull.ff overrides merge.ffPaul Tan, May 13, 2015
  16. 4/4 pull: parse pull.ff as a bool or stringPaul Tan, May 13, 2015
  17. Johannes SchindelinMay 14, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.