Hi,
If you would like to avoid merge commit, use git pull --rebase in place
of plain git pull.
HTH
Julien
Marian Seitner created SSHD-227:
---
Summary: ChannelSession sends SSH_MSG_CHANNEL_DATA after
SSH_MSG_CHANNEL_CLOSE has been sent
Key: SSHD-227
URL: https://issues.apache.org/jira/browse/SSHD-227
Project:
[
https://issues.apache.org/jira/browse/SSHD-227?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Marian Seitner updated SSHD-227:
Attachment: patch-sshd-227.diff
Added a patch which resolved the problem for me, though not sure if
git config --global branch.autosetuprebase always
is meant to act as a safety net
On Wed, Apr 10, 2013 at 7:06 AM, Julien Vermillard
jvermill...@gmail.com wrote:
Hi,
If you would like to avoid merge commit, use git pull --rebase in place
of plain git pull.
HTH
Julien
Le 4/10/13 4:04 PM, Andrew Cagney a écrit :
git config --global branch.autosetuprebase always
is meant to act as a safety net
I start to regret the migration to git ;-)
--
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com
Funny,
as I generally pull specific branchs only,
git pull --rebase works
git pull --rebase origin trunk:trunk is KO
Jeff
On Wed, Apr 10, 2013 at 4:59 PM, Emmanuel Lécharny elecha...@gmail.comwrote:
Le 4/10/13 4:04 PM, Andrew Cagney a écrit :
git config --global branch.autosetuprebase
[
https://issues.apache.org/jira/browse/DIRMINA-933?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13628199#comment-13628199
]
Joshua Warner commented on DIRMINA-933:
---
[~elecharny], we discussed this bug on the
[
https://issues.apache.org/jira/browse/DIRMINA-933?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13628380#comment-13628380
]
Emmanuel Lecharny commented on DIRMINA-933:
---
Damn time has flown...
I just
[
https://issues.apache.org/jira/browse/DIRMINA-933?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Emmanuel Lecharny resolved DIRMINA-933.
---
Resolution: Fixed
Patch applied in 2.0 branch
subtle