 - &quot;reword&quot; allows you to change **ONLY the commit message, NOT the commit contents**
 - &quot;edit&quot; allows you to change **BOTH commit contents AND commit message** (the mechanism by which git allows you to edit the commit contents is by &quot;pausing&quot; the rebase; so you can amend the commit)

**reference** :
The [git-rebase documentation][1] says this:

 - *edit* : By replacing the command &quot;pick&quot; with the command &quot;edit&quot;, you can tell git rebase to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing.
 - *reword* : If you just want to edit the commit message for a commit, replace the command &quot;pick&quot; with the command &quot;reword&quot;.

  [1]: http://git-scm.com/docs/git-rebase

`edit` will pause the rebase entirely, allowing you to change files in the commit and/or the commit message.

`reword` will simply open an editor to let you change the commit message only.

I would like to use a generic type to ensure, that the arguments of a method are of the same type, like this:

    public static &lt;T&gt; void x(T a, T b)

I would assume that the two arguments (a and b), that are passed to this method, would always have to be of the same type. But to my surprise I was able to pass arguments of any type (even primitives) to method x, as if T is erased to Object, no matter what arguments are passed.

The only work-around I found so far, was to use &#39;extends&#39; like this:

    public static &lt;T, U extends T&gt; void x(T a, U b)

But although I can live with it, it is not what I wanted.

Is there a way to use a generic type to force the type of all arguments of a method?

Can the generic type of a generic Java method be used to enforce the type of arguments?

I was wondering how WhatsApp handles the time shown in every message.

For those who don&#39;t know:

 1. If the message is very short, the text and time are in the same row.
 2. If the message is long, the time is in the bottom right corner - the text wrapped around it.

With a `RelativeLayout` and `toLeftOf` I would get 1) but not 2) as previous lines would be &quot;cut off&quot; at the position of the time view. Same behaviour If i use a `LinearLayout`.

So I tried to use a `FrameLayout` or a `RelativeLayout` without any connection between text and time.

However, if the text is as long as the message-view is big, both views would overlap.
If I put blank characters to my message I wouldn&#39;t have the time on the right.

Do they really have some kind of text-wrapping-lib for this or is it possible to do only with layouts?

Here is the requested screenshot:

![enter image description here][1]


  [1]: http://i.stack.imgur.com/MAL6b.png

Whatsapp Message Layout - How to get time-view in the same row

What&#39;s the difference between `edit` and `reword` when you do a git rebase?

I&#39;m going through some docs which say this:

    Replace pick with:
    - edit to mark a commit for amending.
    - reword to change the log message.



git rebase - what&#39;s the difference between &#39;edit&#39; and &#39;reword&#39;

What's the difference between <code>edit</code> and <code>reword</code> when you do a git rebase?
I'm going through some docs which say this:
<pre><code class="hljs language-vbnet">Replace pick with:
- edit to mark a commit for amending.
- reword to change the log message.
</code></pre>

When I do this:

    git clone https://example.com/root/test.git

I am getting this error:

&gt; fatal: HTTP request failed

When I use SSH:

    git clone username git@example.com:root/test.git

I am getting this error:

&gt;    Initialized empty Git repository in /server/user/git@example.com:root/test.git/.git/ &lt;br/&gt;
&gt;    fatal: &#39;user&#39; does not appear to be a git repository &lt;br/&gt;
&gt;    fatal: The remote end hung up unexpectedly

It&#39;s a private repository, and I have added my SSH keys.


How can I clone a private GitLab repository?

I know how to solve this:

    user@host$ git pull
    Updating 9386059..6e3ffde
    error: Your local changes to the following files would be overwritten by merge:
    	foo.bar
    Please, commit your changes or stash them before you can merge.
    Aborting

But isn&#39;t there a way to let `git pull` do the `stash` and `pop` dance for me?

If this command has a different name, it&#39;s ok.

Creating a shell alias for `git stash; git pull; git stash pop` is a solution, but I search for a better solution.


Can &quot;git pull&quot; automatically stash and pop pending changes?

I am trying to use `.gitignore` file to exclude `templates.js` located in `public/app/` folder. My `.gitignore` file looks like this:

    /vendor
    /node_modules
    composer.phar
    composer.lock
    .DS_Store
    templates.js

But when I check in the Git Gui, the `templates.js` file is still show in it. How can I specifically exclude a file using `.gitignore`?

.gitignore exclude specific file

How can one manage to install extras_requires with pip when installing from a git repository ?

I know that you can do `pip install project[extra]` when the project is on pypi.  
And you have to do `pip install -e git+https://github.com/user/project.git#egg=project` for a git repo but I didn&#39;t manage to find how to link these two options together.

Specify extras_require with pip install -e

I have been using a private Gitlab instance to hold all my code. But since most of the staff that work with me now have a Github account, i would really like to get moving and mirror my Gitlab repo to Github.

My situation:

- a server running Gitlab (Omnibus)
- a Github account for which I&#39;ll create an organization for where me and my staff can be organized together.

I know that there is the `--mirror` switch in git, but I am not really sure how this is ment to work. Documentation I found online was very wonky... So it would be nice if someone could help me out. :)

Mirroring from Gitlab to Github

I&#39;m the administrator of the GitHub repository [https://github.com/plison/opendial][1]. I would like to reduce the number of commits on the repository, since the repository already has a few thousand commits, many of whom are minor debugging changes that could easily be squashed together (especially the ones that are a few years old).

I&#39;m therefore trying to apply rebasing in order to squash together part of my commits. However, I&#39;ve experience the following issue:

 1. When I type e.g. `git rebase -i HEAD~10`, I get a quite long number of commit lines (much more than 10) in the interactive editor. What could be the reason?
 2. More importantly, once I close the interactive editor to start the rebasing, I systematically get the error message &quot;error:could not apply &lt;some commit ID&gt;&#39;, **even when I do not make any change to the commits** (i.e. if I leave all lines as &#39;pick&#39;, without any modification or reordering).

How can I solve these issues? It should be noted that the repository was automatically imported from a previous (SVN) repository hosted on Google Code. The conversion seemed so far to have worked well, but I&#39;m wondering why I get these errors when trying to rebase my commits.

  [1]: https://github.com/plison/opendial

Error with git rebase (&quot;could not apply...&quot;)

I have read relevant questions about git merge and git rebase on SO, but I still cannot fully understand what is happening under the hood.

Here is our branching situation:

    MASTER------------------------
            \        \
             \        \----Feature B---
              \                        \
               \-----Feature A----------\---Feature A+B

Given 2 feature branches that stem from master at different times, we now want to combine the 2 branches. We want to follow the `first rebase then merge` practice, but when we rebase Feature A onto Feature B, we get conflicts. That&#39;s expected, because both features (and master) have changes in the same areas. But the strange thing is that the same conflict keeps reappearing after `git rebase --continue`. This drives us crazy, so we end up aborting the rebase, and use `git merge`. It turns out the conflicts are actually easy to resolve.

My question is two-fold:

 1. Is `git rebase` suitable for our situation? Or is rebase only good for pulling in a few (e.g., 1 or 2) changes?
 2. What is happening under the hood that causes the same conflict to reappear again and again? My understanding is `rebase` resolves conflicts one at a time, but which commit does it compare, and what does it compare it to?

Relavant posts on SO:

 - https://stackoverflow.com/questions/13825079/git-rebase-why-i-have-to-resolve-the-same-conflict-over-and-over
 - https://stackoverflow.com/questions/7241678/how-to-prevent-lot-of-git-conflicts-when-git-rebasing-lot-of-commits\
 - https://stackoverflow.com/questions/3516899/git-rebase-resolve-conflicts-again-and-again


Why does the same conflict reappear when I use git rebase?

So my history looks like this:

```
o---o---o---o  master
     \
      o---o---o  A
               \
                o B
```

So, to explain:

- I have branch `A` which was started from `master`
- I have branch `B` (with only 1 commit) which was started from `A`

What I want is this:

```
o---o---o---o  master
             \
              o---o---o  A
                       \
                        o B
```

---

What I did was:

1).

```
git checkout A
git rebase master
```

This resulted in a lot of conflicts which, after some significant time spent fixing, the following history emerged:

```
o---o---o---o  master
             \
              o---o---o  A
```

Which is exactly what I wanted.

(I don&#39;t know where `B` is right now)

---

2).

After this I did a lot of squashes and changed the order of commits on `A`, to make the history look like I want.

---

3).

Now, what I also want to do is:

```
git checkout B
git rebase A
```

However this doesn&#39;t seem to work and I don&#39;t know why. If I do `git log` I see the commits which were there before I did step 1.

Also, I get the same huge number of conflicts which I already solved at step 1. I spent significant time doing it, don&#39;t want to do it again.

[This example](https://stackoverflow.com/questions/27445747/how-to-rebase-over-already-rebased-branch) suggested to use `--onto`, which I did:

```
git checkout B
git rebase --onto A
```

But this deletes the commit on `B` entirely and makes `A` and `B` point to the same commit i.e. the last one on `A`.

---

My question is: **How can I effectively rebase B off A so that it looks like B started from A** ? (which was actually true in the beginning).

My best guess is that I&#39;m using `--onto` wrong. Or that I should use something else (like `cherry-pick`).

How to rebase a branch off a rebased branch?

Suppose I have the following commit history on my local-only branch:

    A -- B -- C

How do I insert a new commit between `A` and `B`?

How to inject a commit between some two arbitrary commits in the past?

What is the difference from `drop` in the Git interactive rebase and just deleting the line of the commit?


Content Type	Original Author	Original Content on Stackoverflow
Question	Snowcrash	View Question on Stackoverflow
Solution 1 - Git	Chris Maes	View Answer on Stackoverflow
Solution 2 - Git	SLaks	View Answer on Stackoverflow

git rebase - what's the difference between 'edit' and 'reword'

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Whatsapp Message Layout - How to get time-view in the same row

Can the generic type of a generic Java method be used to enforce the type of arguments?

Attributions