32 lines
675 B
EmacsLisp
32 lines
675 B
EmacsLisp
<<<<<<< HEAD
|
|
((magit-branch nil)
|
|
(magit-commit nil)
|
|
(magit-dispatch nil)
|
|
(magit-fetch nil)
|
|
(magit-merge nil)
|
|
(magit-pull nil
|
|
("--rebase"))
|
|
(magit-push nil)
|
|
(magit-rebase nil
|
|
("--autostash")))
|
|
=======
|
|
((docker nil)
|
|
(docker-container-inspect nil)
|
|
(docker-container-open nil)
|
|
(magit-am
|
|
("--3way"))
|
|
(magit-branch nil)
|
|
(magit-commit nil)
|
|
(magit-dispatch nil)
|
|
(magit-ediff nil)
|
|
(magit-gitignore nil)
|
|
(magit-merge nil)
|
|
(magit-pull nil
|
|
("--rebase"))
|
|
(magit-push nil
|
|
("--force"))
|
|
(magit-rebase nil
|
|
("--autosquash"))
|
|
(magit-reset nil))
|
|
>>>>>>> bc54f870 (fixing a bunch of broken stuff I think)
|