upstream/mercurial-mirror Files · hgext/largefiles/CONTRIBUTORS

backout: disable --merge with --no-commit (issue4874)...

backout: disable --merge with --no-commit (issue4874) Because "backout --merge" have to make a commit before merging, it doesn't work with --no-commit. We could change "backout --merge" to make a merge commit automatically, and --no-commit to bypass a merge commit, but that change would be undesirable because: a) it's hard to fix bad merges in general b) two commits would be created with the same --message So, this patch simply disables "--merge --no-commit".

various - - Load All Authors

File last commit:

r15168:cfccd3be default


                r27954:9960b636

stable

Download file

             CONTRIBUTORS
        
                    4 lines
            
             | 172 B
            
                | text/plain
            
             |
                TextLexer

/ hgext / largefiles / CONTRIBUTORS

History | Source | Raw |Copy content |Copy permalink

various hgext: add largefiles extension...	r15168	Greg Ward, author of the original bfiles extension
		Na'Tosha Bard of Unity Technologies
		Fog Creek Software
		Special thanks to the University of Toronto and the UCOSP program

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages