Re: [PATCH v7 0/6] fsmonitor: option to allow fsmonitor to run against network-mounted repos

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 16, 2022, 20:09 UTC
Message-ID: <xmqq5yhngjz1.fsf@gitster.g>
In-Reply-To: <pull.1326.v7.git.1663358014.gitgitgadget@gmail.com>

"Eric DeCosta via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 18 quoted lines

>  5:  9c1f408ae6d ! 4:  3a9fe473cf4 fsmonitor: deal with synthetic firmlinks on macOS
>      @@ fsmonitor--daemon.h: struct fsmonitor_daemon_state {
>        };
>        
>        /*
>      -@@ fsmonitor--daemon.h: void fsmonitor_publish(struct fsmonitor_daemon_state *state,
>      -  */
>      - void fsmonitor_force_resync(struct fsmonitor_daemon_state *state);
>      - 
>      -+char *fsmonitor_resolve_alias(const char *path,
>      -+	struct alias_info *alias);
>      -+
>      - #endif /* HAVE_FSMONITOR_DAEMON_BACKEND */
>      - #endif /* FSMONITOR_DAEMON_H */
>       
>        ## fsmonitor-path-utils.h ##
>       @@
>  -:  ----------- > 5:  4d00adb1deb fsmonitor: deal with synthetic firmlinks on macOS

"rebase -i" mistake or something?