thodg/got/regress/cmdline

Diff

• Show log

  Commit

• Hash : a0ea4fc0
  Author :
  Date : 2020-02-28T17:37:53
  

  show merged commit ID + logmsg upon merge conflict during rebase and histedit
  
  This makes it more apparent which commit contained the conflicting change.
  The new output looks like this:
  
    C  sys/dev/pci/if_iwm.c
    8a98d848a1a5 -> merge conflict: properly modify station queues
    got: conflicts must be resolved before rebasing can continue
  

• Files

• Makefile
• add.sh
• backout.sh
• blame.sh
• branch.sh
• cat.sh
• checkout.sh
• cherrypick.sh
• commit.sh
• common.sh
• diff.sh
• histedit.sh
• import.sh
• integrate.sh
• log.sh
• rebase.sh
• ref.sh
• revert.sh
• rm.sh
• stage.sh
• status.sh
• tag.sh
• unstage.sh
• update.sh

• Properties

• Git HTTP	https://git.kmx.io/thodg/got.git
  Git SSH	git@git.kmx.io:thodg/got.git
  Public access ?	public
  Description	https://gameoftrees.org/
  Users
  Tags	0.9 0.8 0.72 0.71 0.70 0.7 0.69 0.68 0.67 0.66 0.65 0.64 0.63 0.62 0.61 0.60 0.6 0.59 0.58 0.57 0.56 0.55 0.54 0.53 0.52 0.51 0.50 0.5 0.49 0.48 0.47 0.46 0.45 0.44 0.43 0.42 0.41 0.40 0.4 0.39 0.38 0.37 0.36 0.35 0.34 0.33 0.32 0.31 0.30 0.3 0.29 0.28 0.27 0.26 0.25 0.24 0.23 0.22 0.21 0.20 0.2 0.19 0.18 0.17 0.16 0.15 0.14 0.13 0.12 0.11 0.10 0.1