On Thu, Jan 18, 2018 at 6:05 PM, Matt Sicker <[email protected]> wrote:
> I tend to use `git commit --amend` locally to continually update my latest > commit. It's rare that I resort to an interactive rebase (generally if I've > somehow managed to screw up a branch's history; just squash it into one > commit and move on). > Good to know. Thanks Matt. Gary > > On 16 January 2018 at 22:01, Ralph Goers <[email protected]> > wrote: > > > See http://gitready.com/advanced/2009/02/10/squashing-commits- > > with-rebase.html <http://gitready.com/advanced/ > > 2009/02/10/squashing-commits-with-rebase.html>. Perhaps we need to add > > this to one of our guide pages. > > > > Ralph > > > > > On Jan 16, 2018, at 8:43 PM, Gary Gregory <[email protected]> > > wrote: > > > > > > Yeah, sorry about that. I"ll be mindful in the future. > > > > > > Gary > > > > > > On Sat, Jan 13, 2018 at 7:18 PM, Ralph Goers < > [email protected] > > > > > > wrote: > > > > > >> 7 commits for the same Jira? > > >> > > >> Ralph > > >> > > >>> On Jan 11, 2018, at 10:48 AM, [email protected] wrote: > > >>> > > >>> Repository: logging-log4j2 > > >>> Updated Branches: > > >>> refs/heads/master e78d205cc -> 672832929 > > >>> > > >>> > > >>> [LOG4J2-2179] > > >>> The MongoDB Appender should use keys and values from a Log4j > > MapMessage. > > >>> Fix compile. Doc it! > > >>> > > >>> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo > > >>> Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/ > > >> commit/67283292 > > >>> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ > > >> 67283292 > > >>> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ > > >> 67283292 > > >>> > > >>> Branch: refs/heads/master > > >>> Commit: 672832929c538c2129be4eeb2683bbe318ba8884 > > >>> Parents: e78d205 > > >>> Author: Gary Gregory <[email protected]> > > >>> Authored: Thu Jan 11 10:48:00 2018 -0700 > > >>> Committer: Gary Gregory <[email protected]> > > >>> Committed: Thu Jan 11 10:48:00 2018 -0700 > > >>> > > >>> ------------------------------------------------------------ > ---------- > > >>> src/site/site.xml | 2 ++ > > >>> src/site/xdoc/manual/appenders.xml | 6 +++--- > > >>> 2 files changed, 5 insertions(+), 3 deletions(-) > > >>> ------------------------------------------------------------ > ---------- > > >>> > > >>> > > >>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ > > >> 67283292/src/site/site.xml > > >>> ------------------------------------------------------------ > ---------- > > >>> diff --git a/src/site/site.xml b/src/site/site.xml > > >>> index d323cd2..f4b1498 100644 > > >>> --- a/src/site/site.xml > > >>> +++ b/src/site/site.xml > > >>> @@ -138,6 +138,8 @@ > > >>> <item name="Kafka" href="/manual/appenders.html# > > KafkaAppender"/> > > >>> <item name="Memory Mapped File" href="/manual/appenders.html# > > >> MemoryMappedFileAppender"/> > > >>> <item name="NoSQL" href="/manual/appenders.html# > > NoSQLAppender"/> > > >>> + <item name="NoSQL for MongoDB" href="/manual/appenders.html# > > >> NoSQLAppenderMongoDB"/> > > >>> + <item name="NoSQL for CouchDB" href="/manual/appenders.html# > > >> NoSQLAppenderCouchDB"/> > > >>> <item name="Output Stream" href="/manual/appenders.html# > > >> OutputStreamAppender"/> > > >>> <item name="Random Access File" href="/manual/appenders.html# > > >> RandomAccessFileAppender"/> > > >>> <item name="Rewrite" href="/manual/appenders.html# > > >> RewriteAppender"/> > > >>> > > >>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ > > >> 67283292/src/site/xdoc/manual/appenders.xml > > >>> ------------------------------------------------------------ > ---------- > > >>> diff --git a/src/site/xdoc/manual/appenders.xml > > b/src/site/xdoc/manual/ > > >> appenders.xml > > >>> index a9c27f5..7ecd9d8 100644 > > >>> --- a/src/site/xdoc/manual/appenders.xml > > >>> +++ b/src/site/xdoc/manual/appenders.xml > > >>> @@ -2065,8 +2065,8 @@ public class JpaLogEntity extends > > >> AbstractLogEventWrapperEntity { > > >>> <a name="NoSQLAppenderMongoDB"/> > > >>> <subsection name="NoSQLAppender for MongoDB"> > > >>> <p> > > >>> - The NoSQLAppender writes log events to a NoSQL database > > >> using an internal lightweight provider interface. > > >>> - This section details specializations for MongoDB. > > >>> + This section details specializations of the <a > > >> href="#NoSQLAppender">NoSQLAppender</a> provider for MongoDB. > > >>> + The NoSQLAppender Appender writes log events to a NoSQL > > >> database using an internal lightweight provider interface. > > >>> </p> > > >>> <table> > > >>> <caption align="top">MongoDB Provider Parameters</caption> > > >>> @@ -2191,8 +2191,8 @@ public class JpaLogEntity extends > > >> AbstractLogEventWrapperEntity { > > >>> <a name="NoSQLAppenderApacheCouchDB"/> > > >>> <subsection name="NoSQLAppender for Apache CouchDB"> > > >>> <p> > > >>> + This section details specializations of the <a > > >> href="#NoSQLAppender">NoSQLAppender</a> provider for CouchDB. > > >>> The NoSQLAppender writes log events to a NoSQL database > > >> using an internal lightweight provider interface. > > >>> - This section details specializations for Apache CouchDB. > > >>> </p> > > >>> <table> > > >>> <caption align="top">CouchDB Provider Parameters</caption> > > >>> > > >>> > > >> > > >> > > >> > > > > > > > -- > Matt Sicker <[email protected]> >
