Default strategy for reconciling divergent branches · 8dc6017b69 - dotfiles - diginaut VCS

diginaut/dotfiles

mirror of https://codeberg.org/diginaut/dotfiles.git synced 2026-05-06 18:04:10 +02:00

Default strategy for reconciling divergent branches

This commit is contained in:

Michiel Scholten

2020-05-25 10:19:23 +02:00

parent 4e8c3dd959

commit 8dc6017b69

1 changed files with 2 additions and 0 deletions

									
										.gitconfig
									
		+2
		
												View File
												
				@@ -63,3 +63,5 @@

				[url "git://bitbucket.org/"]

					insteadOf = "bitbucket:"

				[pull]

					rebase = false