Opened 4 years ago

Last modified 4 years ago

#15 new task

Make custom merge driver so that when branches diverge they are recoverable

Reported by: Daniel Kahn Gillmor Owned by: somebody
Priority: major Milestone: hardened
Component: usability Version: 2.0.0
Keywords: git Cc:

Description

gitattributes(5) and git-merge-files(1) suggest ways to provide custom merge drivers and custom diff engines.

These could be used to keep both the working directories and the centralized repository encrypted, while still enabling people to do a "git rebase origin/master" if they had some sort of race condition.

Change History (2)

comment:1 Changed 4 years ago by Silvio Rhatto

Milestone: hardened
Summary: make custom merge driver so that when branches diverge they are recoverableMake custom merge driver so that when branches diverge they are recoverable
Version: 0.3

comment:2 Changed 4 years ago by Silvio Rhatto

Version: 0.4
Note: See TracTickets for help on using tickets.