Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I just tried this with this version:</p> <pre><code>david@davids-imac:~/t (master) $ git --version git version 1.7.5.4 </code></pre> <p>on Mac OS X 10.7 and, unless I misunderstood your question, it worked just fine. Maybe you are on a different OS/bash that is interpreting the '.' differently? My bash version is:</p> <pre><code>3.2.48(1)-release (x86_64-apple-darwin11) </code></pre> <p>See below for the steps I took:</p> <pre><code>david@davids-imac:~/t $ git init Initialized empty Git repository in /Users/david/t/.git/ david@davids-imac:~/t (master #) $ echo "hi" &gt; t david@davids-imac:~/t (master #%) $ git add t david@davids-imac:~/t (master #) $ git commit -m 'added t' [master (root-commit) 5f959d8] added t 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 t </code></pre> <p>One commit on master now. Next, the new branch and a tag:</p> <pre><code>david@davids-imac:~/t (master) $ git checkout -b branch1 Switched to a new branch 'branch1' david@davids-imac:~/t (branch1) $ echo "hello" &gt; hello david@davids-imac:~/t (branch1 %) $ git add . david@davids-imac:~/t (branch1 +) $ git commit -m 'added hello' [branch1 affb79a] added hello 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 hello david@davids-imac:~/t (branch1) $ git tag v1.1.0.1 </code></pre> <p>I now have a branch with a separate commit and that commit is tagged 'v1.1.0.1'.</p> <p>Now to add one more commit to master (just to make sure the branches have diverged) and merge:</p> <pre><code>david@davids-imac:~/t (branch1) $ git checkout master Switched to branch 'master' david@davids-imac:~/t (master) $ echo "yo" &gt; yo david@davids-imac:~/t (master %) $ git add . david@davids-imac:~/t (master +) $ git commit -m 'added yo' [master 93b09c4] added yo 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 yo david@davids-imac:~/t (master) $ git log commit 93b09c421e1939e3e85738fd5bd4d03b6429e729 Author: David Brown &lt;david@davtar.org&gt; Date: Wed Mar 14 20:24:13 2012 -0600 added yo commit 5f959d85a3059c189121c2b8687788c4384f9e6a Author: David Brown &lt;david@davtar.org&gt; Date: Wed Mar 14 20:23:01 2012 -0600 added t david@davids-imac:~/t (master) $ git merge --no-ff -m "Released v1.1.0.1 to master." v1.1.0.1 Merge made by recursive. hello | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 hello </code></pre> <p>The merge succeeded without opening any editor:</p> <pre><code>david@davids-imac:~/t (master) $ git log commit ac2c62b86c3e631aeda27be601fcc92a9df61146 Merge: 93b09c4 affb79a Author: David Brown &lt;david@davtar.org&gt; Date: Wed Mar 14 20:24:34 2012 -0600 Released v1.1.0.1 to master. commit 93b09c421e1939e3e85738fd5bd4d03b6429e729 Author: David Brown &lt;david@davtar.org&gt; Date: Wed Mar 14 20:24:13 2012 -0600 added yo commit affb79a9d72732b3250b7dca9cc8085b6f36faff Author: David Brown &lt;david@davtar.org&gt; Date: Wed Mar 14 20:23:30 2012 -0600 added hello commit 5f959d85a3059c189121c2b8687788c4384f9e6a Author: David Brown &lt;david@davtar.org&gt; Date: Wed Mar 14 20:23:01 2012 -0600 added t </code></pre>
    singulars
    1. This table or related slice is empty.
    1. POMerging a tagged commit into a branch
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USdevguydavid
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POMerging a tagged commit into a branch
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTAcceptedByOriginator
    1. COHow strange. The steps you produced above are pretty much the same as mine. Yet on my Windows environment, the editor refuses to be bypassed even when a merge message is present. Strange. Thanks for investigating.
      singulars
      1. PO
      1. USDan Lister
    2. COAhh, yes, bash on windows can be a finicky thing. Have you tried adding quotes, single or double, around the tag name?
      singulars
      1. PO
      1. USdevguydavid
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload