1
0
mirror of https://github.com/namibia/tips.git synced 2024-06-26 15:03:28 +00:00
Commit Graph

62 Commits

Author SHA1 Message Date
hemanth.hm
328e594513 Merge pull request #21 from ejmr/tips-from-my-personal-aliases
Three tips adapted from personal aliases which I use
2015-07-30 05:48:07 +05:30
Eric James Michael Ritz
197d23a9b3 Describe how to see commits since forking from master
The command in this tip avoids showing merge commits because sometimes
developers will merge `master` into their feature branch in the course
of development, especially when that feature is in development for a
long time.  This tip focuses on showing only those commits which
introduce new changes and ignores those merge commits for this reason.
It also displays the commits in reverse chronological order, oldest to
newest, so that the output shows the development of a feature branch
in "historical" order.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
2015-07-29 19:00:56 -04:00
Eric James Michael Ritz
3e926cdc9e Describe how to reword the most recent commit message
This is useful for when you realize that you forgot to mention
something important, made a typo, etc.  Obviously you should avoid
using this on a commit which you have already pushed.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
2015-07-29 18:58:03 -04:00
Eric James Michael Ritz
76c268f284 Describe how to list ignored files
This tip shows how to list all ignored files in a project, which will
take into account not only any `.gitignore` file within a repository,
but also any globally defined list of exclusions such as
`/home/eric/.gitexcludes` and `.git/info/exclude` within the
repository itself.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
2015-07-29 18:54:45 -04:00
hemanth.hm
aa62766196 Merge pull request #18 from ejmr/git-push-delete
Add an easier-to-read way to delete a remote branch
2015-07-29 02:05:53 +05:30
Eric James Michael Ritz
8a26365c69 Add an easier-to-read way to delete a remote branch
Since 2010 Git supports the `--delete` argument for git-push as an
alias for the `:branch` syntax, i.e. these commands are equivalent:

    $ git push origin :foo
    $ git push origin --delete foo

This patch changes the tip to use the `--delete` argument on the
grounds that it is easier to remember, easier to understand, and
easily available since it is unlikely for people to be using a version
of Git which is more than five years old.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
2015-07-28 15:04:09 -04:00
hemanth.hm
b76f3c9e53 Merge pull request #20 from samarpanda/file_directory
Git Files
2015-07-28 22:47:00 +05:30
Samar Panda
305d5eb189 Merge branch 'master' into file_directory
* master:
2015-07-28 22:40:18 +05:30
hemanth.hm
b544b7fd32 Merge pull request #19 from samarpanda/usage_git_diff
Git diff usage!
2015-07-28 22:29:25 +05:30
Samar Panda
58a4b7cfd3 git ls-files to show tracked and untracked files 2015-07-28 22:27:12 +05:30
Samar Panda
309397e0c9 git diff multiple usage 2015-07-28 22:08:59 +05:30
hemanth.hm
5c7049059c Merge pull request #17 from samarpanda/git_stash
Git stash
2015-07-28 12:08:58 +05:30
Samar Panda
efaba7db36 Quite handy saving unfinished work
Typo json
2015-07-27 22:13:15 +05:30
Hemanth.HM
3ed8741c28 Git alias 2015-07-27 09:33:30 +05:30
hemanth.hm
b0562c1366 Merge pull request #16 from samarpanda/info_from_commit
Find branches containing commit
2015-07-26 09:23:17 +05:30
Samar Panda
8dda8b55e1 Find out branches containing a commit, including remote branches
Alternative for local branches
2015-07-26 00:09:11 +05:30
hemanth.hm
9e615c7910 Merge pull request #15 from samarpanda/diff-tree
Git diff-tree vs ls-tree
2015-07-25 23:02:14 +05:30
Samar Panda
7810dda14e Clarification of git diff-tree and ls-tree 2015-07-25 22:04:10 +05:30
hemanth.hm
964216ba73 Merge pull request #14 from samarpanda/cherry-pick
Using git cherry-pick
2015-07-25 16:04:23 +05:30
Samar Panda
7ecc00c50b Tips using git cherry-pick 2015-07-25 15:41:59 +05:30
hemanth.hm
885357aa83 Merge pull request #13 from stoeffel/append
use doxie.append
2015-07-23 04:37:25 +05:30
Christoph Hermann
e5f64df204 use doxie.append 2015-07-22 20:13:35 +02:00
Hemanth.HM
85df5705fb whatchanged 2015-07-22 13:26:24 +05:30
Hemanth.HM
55778710ea Support alternatives in tips. 2015-07-17 13:01:25 +05:30
hemanth.hm
a082bb79d2 Merge pull request #12 from anchal20/master
list remote reference and get list of branches
2015-07-17 12:37:07 +05:30
Anchal
9cc9a46519 tried with alternatives 2015-07-17 12:27:32 +05:30
Anchal
04f388e191 Merge remote-tracking branch 'upstream/master' 2015-07-17 12:26:08 +05:30
Hemanth.HM
6cfcc26d9f Get git bash completion. 2015-07-17 06:51:14 +05:30
Anchal
3dcab1f843 list remote reference and get list of branches 2015-07-16 17:39:38 +05:30
Hemanth.HM
0cd100f768 Stage parts of a changed file, tip 2015-07-16 12:29:32 +05:30
hemanth.hm
d9ebd3156d Merge pull request #11 from jonmaim/patch-1
Stage parts of a changed file, instead of the entire file.
2015-07-16 12:28:32 +05:30
Jon Maim
e25227a25d Update tips.json 2015-07-16 12:25:13 +05:30
Hemanth.HM
abd2e497a2 Doing away with slug dep 2015-07-16 09:16:42 +05:30
Hemanth.HM
04573ea87d Changing a remote's URL 2015-07-16 09:07:15 +05:30
hemanth.hm
979fe1c80d Merge pull request #10 from anchal20/master
undo local changes
2015-07-16 09:04:27 +05:30
Anchal
695e7e19ba undo local changes 2015-07-15 22:56:22 +05:30
Hemanth.HM
6b5936ce57 Slugified. 2015-07-15 20:35:53 +05:30
Hemanth.HM
2bf7f0ea91 dashified title to fix TOC. 2015-07-15 20:16:49 +05:30
Hemanth.HM
acd8501b5f Updated readme 2015-07-15 20:07:46 +05:30
hemanth.hm
819e1550df Merge pull request #9 from anchal20/master
tip for deleting a local or remote branch
2015-07-15 20:06:47 +05:30
Anchal
081dc010b7 tip for deleting a local or remote branch 2015-07-15 20:02:59 +05:30
Anchal
7db7aae79b tip for deleting a local or remote branch 2015-07-15 20:00:26 +05:30
hemanth.hm
dabba0095f s/clone/fork/g 2015-07-15 19:09:15 +05:30
hemanth.hm
9fa82eb49b Merge pull request #8 from git-tips/revert-7-master
Revert "tip for deleting a local or remote branch"
2015-07-15 19:07:07 +05:30
hemanth.hm
0a7bbef10c Revert "tip for deleting a local or remote branch" 2015-07-16 00:37:01 +05:30
hemanth.hm
abb579e995 Merge pull request #7 from anchal20/master
tip for deleting a local or remote branch
2015-07-15 19:03:16 +05:30
Anchal
8c45240d89 tip for deleting a local or remote branch 2015-07-15 18:44:33 +05:30
hemanth.hm
5b5410651d Links to the files. 2015-07-15 16:56:39 +05:30
Hemanth.HM
abbfdf3309 Some more info 2015-07-15 16:48:24 +05:30
Hemanth.HM
fa5b33581e More info. 2015-07-15 16:47:39 +05:30