diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-07 16:36:36 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-07 16:36:36 -0400 |
| commit | 16a95afa2fe22a4df9c371489c4ee7ffdef8e07b (patch) | |
| tree | 6e0869e78aba03be2591569369e1e099bb86568e /doc/forum/Fail_to_push_changes_when_merging | |
| parent | 9bbc292b3f903a1476e3524bb9198e58ce300401 (diff) | |
| parent | 822694e790102efa2a5bb4a0c3d62c6fce1d4e87 (diff) | |
Merge remote-tracking branch 'remotes/misandrist/FreeBSD' into wip
Diffstat (limited to 'doc/forum/Fail_to_push_changes_when_merging')
3 files changed, 33 insertions, 0 deletions
diff --git a/doc/forum/Fail_to_push_changes_when_merging/comment_1_a44e03cbce4c996e136f917d8e06a7bb._comment b/doc/forum/Fail_to_push_changes_when_merging/comment_1_a44e03cbce4c996e136f917d8e06a7bb._comment new file mode 100644 index 00000000..751d701a --- /dev/null +++ b/doc/forum/Fail_to_push_changes_when_merging/comment_1_a44e03cbce4c996e136f917d8e06a7bb._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="spwhitton" + subject="comment 1" + date="2015-12-08T01:20:26Z" + content=""" +It looks like git is failing because it can't autodetect an e-mail address for root on the target machine. This might be because the target machine does not have a FQDN, but I'm not sure. Try logging into the target machine as root and running + + git config --global user.email root@lending-test.local + git config --global user.name root + +as it suggests. +"""]] diff --git a/doc/forum/Fail_to_push_changes_when_merging/comment_2_4c8e1d9409b8ecfc465550fbbf5c0708._comment b/doc/forum/Fail_to_push_changes_when_merging/comment_2_4c8e1d9409b8ecfc465550fbbf5c0708._comment new file mode 100644 index 00000000..47eb9f6a --- /dev/null +++ b/doc/forum/Fail_to_push_changes_when_merging/comment_2_4c8e1d9409b8ecfc465550fbbf5c0708._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="arnaud@30aba4d9f1742050874551d3ddc55ca8694809f8" + nickname="arnaud" + subject="comment 2" + date="2015-12-08T07:04:21Z" + content=""" +Thanks, I will try that. But why does it not happen when updating with fast-forward? +"""]] diff --git a/doc/forum/Fail_to_push_changes_when_merging/comment_3_bdf54ac096c994c33d661b454d89c770._comment b/doc/forum/Fail_to_push_changes_when_merging/comment_3_bdf54ac096c994c33d661b454d89c770._comment new file mode 100644 index 00000000..a59296a0 --- /dev/null +++ b/doc/forum/Fail_to_push_changes_when_merging/comment_3_bdf54ac096c994c33d661b454d89c770._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2015-12-08T15:53:27Z" + content=""" +Looks like a lacking FQDN indeed. There's a property to fix that! ;) + +Git is also picky about the user having a name. + +AFAIK, git does not make commits for fast-forward merges, but it does for +non-fast-forward merges. I suspect that it's making such a merge in your +case. +"""]] |