1
0
mirror of https://github.com/namibia/tips.git synced 2024-11-13 16:56:30 +00:00
Commit Graph

193 Commits

Author SHA1 Message Date
Jorge Marin
79da03dbe0 Fix merge/rebase from master 2016-06-20 21:01:17 +02:00
Jorge Marin
418b227c12 Add tip for first commit in a branch 2016-06-19 19:50:21 +02:00
S N Munendra
614e5a9638 resolve merge conflict 2016-06-19 20:40:54 +05:30
S N Munendra
4cf5bbdaa7 Merge https://github.com/git-tips/tips 2016-06-19 20:34:11 +05:30
Cédric Félizard
b096219f31 Add alternative to update submodules 2016-06-19 11:44:59 +00:00
S N Munendra
a5db829708 Add tip to search commit log 2016-06-18 19:58:58 +05:30
hemanth.hm
d318ded72e Merge pull request #94 from denisbalyko/master
Added alternative update submodules
2016-06-18 18:44:07 +05:30
denisbalyko
7cfb002474 fix indent 2016-06-18 12:44:05 +03:00
denisbalyko
9d905ac6d1 added alternative update submodules 2016-06-18 12:42:31 +03:00
Gerard Braad
ca7e782a9f Add tip for shallow copy 2016-06-17 15:32:33 +00:00
hemanth.hm
cffab88ab8 Merge pull request #91 from scriptype/master
Add git grep --heading --line-number <pattern>
2016-06-17 19:16:36 +05:30
Marc Beuret
474262b119 Add tip to delete local and remote tag 2016-06-17 12:56:27 +02:00
scriptype
221aa76eec Add git grep 2016-06-17 02:58:38 +03:00
hemanth.hm
d5ca8fabcc Merge pull request #90 from p-v/master
Show all local branches ordered by recency
2016-06-16 17:49:21 +05:30
Pratyush
e22b7b17d5 Add tip to show recently updated branches 2016-06-16 15:19:33 +05:30
Aditya Harsh
bdad5790be Add custom editor 2016-06-16 14:16:41 +05:30
hemanth.hm
dec07c0170 Merge pull request #83 from andela-dJames/feature-colored-terminal-output
Add tips for changing git terminal output color settings
2016-06-14 09:40:35 +05:30
hemanth.hm
b6eba1acb0 Merge pull request #84 from AndrewCvekl/master
Added another git command
2016-06-14 09:40:04 +05:30
hemanth.hm
ace3526a7f Merge pull request #85 from munendrasn/master
Adds alternatives to create and switch branch
2016-06-14 09:39:24 +05:30
Schumacher, Jeffrey
4efcd6cff6 Adding alternative to deleting branches merged to master that will not delete master itself 2016-06-13 11:17:54 -07:00
S N Munendra
0558db872b Adds alternatives to create and switch branch 2016-06-13 23:00:07 +05:30
Andrew
15698a4e20 Added another git command 2016-06-13 12:36:12 -04:00
hemanth.hm
1c07f20d21 Merge pull request #81 from Ranhiru/add-staged-as-a-synonym-for-cached
Added git diff --staged to be synonym for git diff --cached
2016-06-13 21:48:37 +05:30
andela-djames
223f430e1e Add tips for changing git terminal output color settings 2016-06-13 15:00:11 +01:00
Ranhiru Cooray
1ff31a939f Added alternative as an array 2016-06-13 19:47:46 +08:00
Ranhiru Cooray
32f2a4af35 Added --staged as an alternative 2016-06-12 22:41:16 +08:00
Ranhiru Cooray
c147aa64e2 Added git diff --staged to be synonym for git diff --cached 2016-06-12 19:53:00 +08:00
denisbalyko
b7c0a19ded Added git checkout -b 2016-06-12 11:10:42 +03:00
Martin Tamashiro
6209b8ba85 Ignore file mode changes on commits 2016-06-11 14:59:23 -03:00
hemanth.hm
4668721ea5 Merge pull request #75 from kadikraman/fix-remove-merged-to-master
Remove --no-run-if-empty flag on removing branches that are merged to master
2016-06-11 20:13:00 +05:30
ank91
d7e4e4a422 Add clone single branch command 2016-06-10 16:10:16 +05:30
Kadi Kraman
3bd8fae29b Remove --no-run-if-empty flag 2016-06-09 09:56:45 +01:00
hemanth.hm
d9a8859604 Merge pull request #63 from exalted/patch-2
Improve cleaning up branches merged into master
2016-06-09 12:06:32 +05:30
hemanth.hm
e2eb80ed24 Merge pull request #64 from exalted/patch-3
Use log instead of whatchanged
2016-06-09 12:06:22 +05:30
hemanth.hm
7ed587483e Merge pull request #73 from David-Wobrock/master
Formatting tabs into spaces and adding tip of tracing changes to one file
2016-06-09 12:05:40 +05:30
hemanth.hm
d3b180632b Merge pull request #62 from exalted/patch-1
Branches merged into master without checkout first
2016-06-09 12:04:45 +05:30
David-Wobrock
cc2f616e56 Add tip for tracing all changes made to a file 2016-06-08 22:54:04 +02:00
David-Wobrock
c49409830a Formatting tabs into spaces.
Doxie throws errors like '[doxie] Invalid JSON input: "Unexpected token	 in JSON at position 11987"' otherwise
2016-06-08 22:39:40 +02:00
hemanth.hm
9f5a85580a Merge pull request #61 from nirajpandkar/master
Bypass pre-commit and commit-msg githooks
2016-06-08 21:03:35 +05:30
Olga Brani
160fa86460 MINOR: Fix typo 2016-06-08 11:08:07 +03:00
nirajpandkar
9b268214be Bypass githooks 2016-06-08 10:41:01 +05:30
Alexander Pavlov
e27d2a6792 Return formatting 2016-06-07 23:34:22 +05:00
Alexander Pavlov
285989a707 NEW: Add info about git bisect 2016-06-07 23:32:38 +05:00
Ali Servet Donmez
ba5cd1c4f1 Use log instead of whatchanged
As per documentation (https://git-scm.com/docs/git-whatchanged):

"New users are encouraged to use git-log(1) instead. The whatchanged command is essentially the same as git-log(1) but defaults to show the raw format diff output and to skip merges.

The command is kept primarily for historical reasons; fingers of many people who learned Git long before git log was invented by reading Linux kernel mailing list are trained to type it."
2016-06-07 09:42:13 +02:00
Ali Servet Donmez
aec9d8b1a3 Improve cleaning up branches merged into master 2016-06-07 09:32:41 +02:00
Ali Servet Donmez
998a5c8523 Branches merged into master without checkout first 2016-06-07 09:30:05 +02:00
Nam Pham
bbbde86e8d Add: List all brach is WIP 2016-06-07 10:42:27 +07:00
Santiago Castro
9c8e924bca 'to the a file' -> 'to a file' 2016-06-05 15:23:49 -03:00
surfer190
0969a61d46 Change wording to show references are removed 2016-06-02 13:14:25 +02:00
Joel Gallant
1279208ef3 Adding git to cherry-pick 2016-06-01 10:49:41 -06:00
HyeonChol Jang
e5d29ecd55 Revert "Add list command" 2016-05-30 13:45:10 +09:00
zxcxz7
04323cc7be
Correct paths 2016-05-26 23:21:31 +09:00
zxcxz7
55e2d4fa75
Update tip and add an alternative
Update find command to exclude hidden directories.
Add GNU find command
2016-05-26 23:17:03 +09:00
zxcxz7
312b4a6c99
Add list command 2016-05-26 17:37:51 +09:00
S N Munendra
80e1993266 merging two commits into one. 2016-05-18 17:33:13 +05:30
Hemanth.HM
dc8e9d6f96 root and merge commits tips. 2016-05-11 22:24:34 +05:30
Hemanth.HM
b238e44ff1 git show 2016-04-29 20:18:50 +05:30
Hemanth.HM
168303734b staged diff 2016-04-18 20:11:57 +05:30
Hemanth.HM
157337d356 orphan branch 2016-04-10 21:07:36 +05:30
Daniel Cortes
8b9d2366f1 Added tip to remove an entry from the global config. 2016-04-06 14:20:46 -06:00
Hemanth.HM
1cde458164
GPG sig in logs 2016-04-06 18:57:11 +05:30
Hemanth.HM
a01ef67d14 instaweb 2016-04-02 22:00:49 +05:30
Hemanth.HM
33c82592ac gc 2016-03-29 21:45:21 +05:30
Hemanth.HM
67b0393bb1 count-objects 2016-03-29 21:41:53 +05:30
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
c99cc15ad1 Format 2016-01-29 22:07:26 +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
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
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