1
0
mirror of https://github.com/namibia/tips.git synced 2024-11-15 01:34:13 +00:00
Commit Graph

137 Commits

Author SHA1 Message Date
Hemanth.HM
def56a7e7b open conflicted files 2016-03-11 19:28:15 +05:30
Hemanth.HM
1ca386656a rerere.enabled 2016-03-09 22:28:58 +05:30
Hemanth.HM
a5be265d69 Commits in Branch1 that are not in Branch2 2016-03-06 16:58:58 +05:30
Hemanth.HM
46e66ce4b5 Status of ignored files. 2016-03-02 19:36:56 +05:30
Hemanth.HM
27f7cefb1b List ignored files. 2016-03-02 19:33:10 +05:30
Hemanth.HM
7dcbedb269 -am 2016-02-26 19:08:55 +05:30
Hemanth.HM
d07dd0040c --autosquash tip 2016-02-22 19:20:47 +05:30
Hemanth.HM
f886fd31fa --fixup tip 2016-02-22 19:16:57 +05:30
Samar Panda
e416adc1ff Untrack files without deleting 2016-02-12 23:56:56 +05:30
Samar Panda
c42e1547ab Grab a file from a stash. Restore file as per a commit hash 2016-02-12 23:40:59 +05:30
Hemanth.HM
90d98ea980 --dry-run 2016-02-10 17:26:02 +05:30
Hemanth.HM
7e6c5f71b2 Check if the change was a part of a release. 2016-02-02 18:36:01 +05:30
Hemanth.HM
f8d2278bd0 auto correct typos 2016-01-31 21:00:33 +05:30
Hemanth.HM
f4b8b94f59 Make git case sensitive. 2016-01-31 20:58:17 +05:30
Hemanth.HM
dfc0613a78 List config and alias 2016-01-29 22:09:51 +05:30
Hemanth.HM
2ce80d7d5d Reset author 2016-01-17 22:13:52 +05:30
Hemanth.HM
321da85d47 ammed author 2016-01-17 22:12:36 +05:30
Hemanth.HM
3c31eac721 branch.autosetuprebase 2016-01-01 21:12:17 +05:30
Hemanth.HM
7078656d7c Restore deleted file. 2015-12-27 19:08:25 +05:30
Hemanth.HM
8181a37dd1 clean files from .gitignore 2015-12-25 19:25:50 +05:30
Hemanth.HM
6197057dc7 --assume-unchanged and no--assume-unchanged 2015-12-19 22:25:07 +05:30
Hemanth.HM
7f3f56c62e inline word diff 2015-12-18 20:56:55 +05:30
Eric James Michael Ritz
d80c4ed36c Show how to read guides that come with Git
This patch adds a tip explaining `git help -g`.  That command will
list a collection of useful guides that come "pre-built" with Git,
e.g. `git help workflows` and `git help revisions`.  These are useful
resources for learning and looking-up common Git concepts and
techniques, and that broad usefulness is the justification for placing
the tip near the very top of the list.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
2015-11-17 21:20:38 -05:00
Eric James Michael Ritz
7fdd7304d0 Add a tip to show the most recent tag
This tip shows how to display the most recent tag reachable on the
current branch.  The use of `--abbrev=0` is necessary otherwise the
output would contain additional information (specifically part of a
commit hash), appended to the tag name.  It's worth noting that this
command is usable for branches other than the current one, e.g.

    $ git describe --tags --abbrev=0 master

That would show the most recent tag on the `master` branch regardless
of whatever branch the user is currently on.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
2015-11-02 22:00:16 -05:00
Samar Panda
f89a062f72 Fetch PR by ID to a local branch 2015-10-28 16:24:02 +05:30
Eric James Michael Ritz
c46f049974 Add a tip for automatically stashing changes before a rebase
Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
2015-10-28 00:45:57 -04:00
Eric James Michael Ritz
1646af51e3 Describe help for commonly-used Git commands with examples
This patch adds the command `git help everyday`, which shows a
man-page that comes with Git describing the most common commands for
everyday usage.  The tip is specifically at the top of the list on the
grounds that it is the fastest way to find help for performing basic
operations in Git, which is very useful to people new to Git.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
2015-10-28 00:45:42 -04:00
André Aubin
af16b3c8eb Typo
form → from
2015-10-09 14:28:19 +02:00
Vincent Klaiber
47a525a534 Purnes -> Prunes 2015-09-29 12:37:17 +02:00
Jan-Piet Mens
31ce22adac ignore a file 2015-09-29 09:43:53 +02:00
Roland
3b8df89962 Fixed typo 2015-09-20 18:52:48 +00:00
Hemanth.HM
affd2f840a Get the name of the current branch 2015-09-19 17:59:32 +05:30
Hemanth.HM
c0faf65fc9 Import form a bundle 2015-09-13 21:25:07 +05:30
Hemanth.HM
ebd7521a49 git bundle 2015-09-13 21:22:57 +05:30
Samar Panda
1f08b12668 Updated title text 2015-09-02 20:21:18 +05:30
Samar Panda
8e73868075 pull changes of subproject using git subtree 2015-09-02 20:10:26 +05:30
Samar Panda
b31618b975 Adding a project to repo using subtree 2015-09-02 19:58:41 +05:30
Samar Panda
061d6ba4bb Deploying git tracked subfolder to gh-pages 2015-09-02 19:38:07 +05:30
Hemanth.HM
8746905b37 Visualize the version tree. 2015-08-30 20:32:40 +05:30
Hemanth.HM
e9e75fed9e commit hash of the initial revision 2015-08-28 18:17:40 +05:30
Hemanth.HM
435fc51703 Prune origin. 2015-08-25 18:39:20 +05:30
Pratyush
97ea96885a tip to amend last commit 2015-08-22 19:20:06 +05:30
Hemanth.HM
5c85e36770 Archive a branch. 2015-08-22 18:25:04 +05:30
Hemanth.HM
5d57c4f132 rebases and merge feature branch to master. 2015-08-21 19:34:59 +05:30
Pratyush
274f663e6b tip to rename a branch 2015-08-19 14:59:29 +05:30
Pratyush
3048cfb182 add git cherry tip 2015-08-17 00:48:33 +05:30
Bernat Borrás Paronella
548f59900c Fix Typo
fix typo from #25
2015-08-15 14:12:24 +02:00
Samuel Chase
2c82081aed Fix shell command and spelling 2015-08-14 10:36:46 +05:30
Hemanth.HM
a0f2f10ec9 update all submodules. 2015-08-12 20:55:36 +05:30
Anchal
f7ac6d21b6 alternative for cleaning untracked directory 2015-08-11 12:19:37 +05:30
Anchal
9ac4b5be05 get list of untracked files/directory 2015-08-11 11:48:14 +05:30
Anchal
d74c78a473 get list of untracked files/directory 2015-08-11 11:47:49 +05:30
Anchal
fd7f20a395 clean untracked files and directory 2015-08-11 11:41:10 +05:30
Samar Panda
a2319d7090 git stash save -u which i started using 2015-08-07 06:27:15 +05:30
Samar Panda
4cdc87f48e Using revert and reset 2015-07-31 16:13:57 +05:30
Samar Panda
de65ecb886 Help tips around git worktree one of git 2.5 features 2015-07-31 03:52:44 +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
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
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
Samar Panda
8dda8b55e1 Find out branches containing a commit, including remote branches
Alternative for local branches
2015-07-26 00:09:11 +05:30
Samar Panda
7810dda14e Clarification of git diff-tree and ls-tree 2015-07-25 22:04:10 +05:30
Samar Panda
7ecc00c50b Tips using git cherry-pick 2015-07-25 15:41:59 +05:30
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
Anchal
9cc9a46519 tried with alternatives 2015-07-17 12:27:32 +05:30
Hemanth.HM
6cfcc26d9f Get git bash completion. 2015-07-17 06:51:14 +05:30
Hemanth.HM
0cd100f768 Stage parts of a changed file, tip 2015-07-16 12:29:32 +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
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
fa5b33581e More info. 2015-07-15 16:47:39 +05:30
Hemanth.HM
eff7432b3a Migrated to doxie ❤️ 2015-07-15 16:31:27 +05:30
Hemanth.HM
dd2031c387 Fixed conflicts 2015-07-15 15:59:20 +05:30
Hemanth.HM
c68571f98e Tip from @vinkla 2015-07-15 15:58:23 +05:30
Thomas Stringer
f8f15467d6 Changed headers of tips to be smaller text 2015-07-15 06:25:24 -04:00
Thomas Stringer
bad3155f1f Added a couple of common upstream commands to track and check status 2015-07-15 06:24:22 -04:00
Vincent Klaiber
b6b103fe70 Remove branches that have already been merged with master 2015-07-15 09:40:18 +02:00
Phalgun Guduthur
7c4096ffb2 More git tips 2015-07-15 13:05:57 +05:30
Hemanth.HM
68f6970979 🔥 2015-07-15 12:56:27 +05:30