projects / feisty_meow.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7094090) | patch
another attempt to clean up superfluous merges
authorChris Koeritz <fred@gruntose.com>
Sun, 7 Jan 2018 17:15:26 +0000 (12:15 -0500)
committerChris Koeritz <fred@gruntose.com>
Wed, 10 Jan 2018 20:01:12 +0000 (15:01 -0500)
commitf4a70f561331ef268496f0e198b778ecc8739573
tree44144663199c87b38a113228fafdc622e38cc218tree | snapshot
parent70940904eef51d92708d23dd7516d38e5b5d96a6commit | diff
another attempt to clean up superfluous merges

we want to stop seeing pointless merge messages in the commit log.  this should take care of it, although there can be a problem if the code stashed before pulling is *way* out of synch with the code being pulled.  that problem would afflict the merge also though, and it is better to find out as soon as possible rather than letting the snarl grow larger.
scripts/rev_control/version_control.sh diff | blob | history