Google Git
Sign in
googlers / jrn / git / 252a7c02354a3e2825cfde3c5053a04acc07be9c / Documentation / merge-options.txt
  1. d66424c git-merge: add --ff and --no-ff options by Lars Hjemli · 17 years ago
  2. d08af0a git-merge: add support for --commit and --no-squash by Lars Hjemli · 17 years ago
  3. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  4. 51e7ecf Add a configuration option to control diffstat after merge by Alex Riesen · 18 years ago
  5. 7d0c688 git-merge --squash by Junio C Hamano · 19 years ago
  6. 9688a88 Documentation: recursive is the default strategy these days. by Junio C Hamano · 19 years ago
  7. 93d69d8 Refactored merge options into separate merge-options.txt. by Jon Loeliger · 19 years ago