1
0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-06-16 12:54:01 -03:00
Commit Graph

287 Commits

Author SHA1 Message Date
f9792e9c68 Clean up READMEs (#198)
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-01-01 11:40:52 -06:00
590f63c7e6 Add colon 2017-12-30 12:26:44 -06:00
5de8869df2 Add a way to find tags containing specific commit (#195)
* Add a way to find tags containing specific commit

* fixup! Add a way to find tags containing specific commit
2017-12-30 13:21:53 -05:00
4dcb631734 Including snippet to list commits containing specific files (#197) 2017-12-30 12:57:11 -05:00
e4e6ee08b1 Add "I want to delete multiple branches" (#196) 2017-12-30 12:25:11 -05:00
26138f0f10 Fixed typo in git branch -rr invocation (#190) 2017-12-29 09:52:07 -05:00
68820c1dc3 Auto-check for translated pages README_*.md with Travis CI (#188) 2017-12-23 10:51:19 -05:00
84322067fe Updated Russian translations (#187) 2017-12-23 10:50:23 -05:00
7dc4eedb17 Removing -x on git clean tip to avoid unintentional use (#186)
* Removing -x on git clean to avoid unintentionally use

* Removing ! on git clean tip
2017-12-22 10:43:25 -05:00
697dbb404f Update CONTRIBUTE.md (#185)
gitlocalize repository url
2017-12-22 09:41:14 -05:00
423eaf0ede Merge pull request #183 from sotayamashita/feature/validate-links
Add travis config to validate links
2017-12-21 14:07:29 -05:00
ae8459b6da Missed this grammar bit 2017-12-20 20:39:16 -05:00
3966d41462 Add translation section to contributing (#179)
* Add translation section to contributing

* Update CONTRIBUTE.md

* Update CONTRIBUTE.md

* Update CONTRIBUTE.md
2017-12-20 20:38:10 -05:00
ca04c4bfb4 Added the Atlassian Git tutorial site (#181) 2017-12-20 16:08:19 -05:00
58fab97420 Fixed the typo for Sourcetree and updated the description (#180) 2017-12-19 22:12:56 -05:00
c91d1081c4 Add travis config to calidate links 2017-12-20 11:34:49 +09:00
e5039cc2b9 Rename zh-CN translation to be compatible with GitLocalize (#178) 2017-12-19 19:47:46 -05:00
f462bad54d Add examples from the common screwups resource in #40 (#175)
* Adding submodule section

* Add the rest of the commands
2017-12-19 19:47:30 -05:00
da44b4d6c1 add the usage information for for git-branch --set-upstream-to (#176)
* add application for git-branch --set-upstream-to

* run doctoc - typo in one line for the TOC

* put note in bash comment
2017-12-18 09:03:33 -05:00
da6f0f8e66 Branches - list branches (#171) 2017-12-16 11:50:00 -05:00
d6d5c6f920 fix a typo (#170) 2017-12-13 10:12:23 -05:00
4a6f537157 Merge pull request #166 from k88hudson/feat/set-head
Add an example using `set-head`
2017-12-12 13:06:54 -03:00
8d74313257 Add reset-author and no-edit to author rewriting (#169) 2017-12-12 08:56:52 -05:00
418f0a0032 Added new topic: Finding (#168)
* New Topic for 'Finding'

Added command which can be used to find a string in any commit

* Added command that can be used to find for commits either by author or committer

* Fixed link
2017-12-10 14:08:44 -05:00
472f05caf0 Added section with links to every language (#167) 2017-12-10 14:07:30 -05:00
7a68447ac9 Add an example using set-head
This is just one of many possible examples using set-head, but which might be useful for others to discover the command.
2017-12-08 15:39:07 -05:00
12bc63375d A few cleanups (#163)
* Consolidate the name of the subsystem

The name of the subsytem is considered to be 'Git' and not 'git'.
There was inconsistency in the document by referring to the subsystem
using both 'git' and 'Git'.

Consolidate the usages to 'Git' which is generally considered to be
the name of the subsystem.

* Consolidate the name of GitHub

They website is generally called 'GitHub' and not 'github'.

* Quote the git commands correctly

* Avoid fullstops in section names

This is done for the sake of consistency. Most of the section names
don't have a fullstop at the end.

So, ...

* Update the ToC

The Table of Contents seems to have been out of date with the section
titles.

So, update the ToC with 'doctoc'.

* Clarify that the changes are removed only for the previous commit

* Showcase the flexibility of `git fetch -p`

The example for that exhibits the way to 'prune' remote branches that
were deleted upstream wasn't flexible as it relied on the command
defaulting to the upstream of the current branch. This might lead
the reader into overlooking the flexibility of the `git fetch`.

Show that the 'upstream' can be mentioned in the command thus show
casing the flexibility of `git fetch`.

* Exemplify the safer version of branch deletion

It's not good for newbies to start using 'force deletion' when they
want to delete a branch as it might lead them to them into
'accidentally' deleting their branches often without merging them
into other branches or pushing them to an upstream.

So, exemplify the safer version of branch deletion (branch -d) and
warn them about what `git branch -D` does.

* Improve readability of a few phrases

It's not required to use 'git' a lot as this a document about Git,
after all.

* Use HTTPS links for sites that serve using HTTPS

* Clarify that rebasing just re-writes history

Rebasing fast-forwards when the tip of the branch is a descendent of
the tip of the upstream. In other cases it re-writes the history. This
re-write is what actually leads the user to 'force' update the remote.

So, clarify that a user has to force update only when the history is
re-written regardless of whether the branch was fast-forwarded.

* Attribute both the authors of the second edition of Pro Git

* Try a different form of emphasizing text

Capitalizing words seems to be over emphasizing words. Italicize
the words, instead to see if works.

* Mention what 'upstream' means for the sake of clarity

* Simplify the way to create a remote branch from the local one

The commands were needlessly complex by not considering the fact
that the command defaults to HEAD when no branch is specified and
changing configuration when it wasn't required.

Simplify the commands to make readers more happy!

* Remove a character cruft left over while editing

This is an instance of a carelessly edited document getting into
version control. ;)

* Improve a sentence

... by,

- expanding acronyms
- quoting a command line parameter
2017-12-08 11:47:41 -05:00
565b8259da Update Russian translations up to English source (#165) 2017-12-07 15:18:06 -05:00
0e478ad4cc Show how a newly added file can be removed (#164)
This shows how the user can remove a newly added file from the
previous commit.
2017-12-04 15:57:20 -05:00
231b474600 Discarding staged changes vs unstaged changes - commands corrected (#159)
* Discarding staged changes vs unstaged changes - commands corrected

* added space between word and parenthesis

* Added <a> tag and TOC for content

* adding missing backticks

* Updated links in staging section
2017-12-03 11:57:20 -05:00
02e357c5b4 Added russian translations (#161) 2017-12-02 15:09:14 -05:00
c128fff050 Iss-150: Fixed section about discarding local uncommitted changes (#160)
Iss-150: minor fix
2017-11-30 16:28:13 -05:00
5eaca03df3 Merge pull request #158 from juanca87/git-merge-abort
Added command to abort the merge
2017-11-28 11:14:27 -03:00
045015f66d Update README.md
Added a link to the description to abort the merge
2017-11-28 10:52:16 -03:00
5fc6b2289d Added command to abort the merge 2017-11-28 00:02:58 -03:00
f4c0fac6ef Add safety note for git reset --hard (#157)
resolves #155
2017-11-27 15:44:52 -05:00
7440fa32b5 Discard local uncommitted changes (#156) 2017-11-27 13:30:38 -05:00
02043187a7 Add githug (#152)
* Add githug

Githug is a great interactive game for leaning git

* Update README.md
2017-11-26 19:01:08 -05:00
7cdaca391f Added some common Git screwups and solutions (#148)
* Added some common Git screwups and solutions

* Added required changes

* Added another way to create new remote branch

* Added required changes

* Added required changes

* Added  required changes

* Added required changes
2017-11-26 19:00:03 -05:00
8426f177dd Fix #149 @RichardLitt comment
Fix #149 PR merged
2017-11-23 21:41:39 -03:00
71f2ab2917 Merge pull request #149 from flexdinesh/master
flight-rule to stash multiple files at once
2017-11-23 12:05:22 -03:00
4bf16453c6 flight-rule to stash multiple files at once 2017-11-23 01:11:14 +05:30
7412b89d42 Merge pull request #147 from benyanke/patch-1
Added gitk
2017-11-21 16:33:36 -05:00
11c11ecc21 Update README.md 2017-11-21 13:23:03 -06:00
5088d30821 Add sample of -u option of git stash (#146) 2017-11-21 13:13:31 -05:00
adb5a2d250 added command to create a branch from a commit (#145)
Using this command one can create a branch from a specific commit from current branch.
2017-11-20 13:51:04 -05:00
4cb52c015c fix typo (#142) 2017-11-19 12:56:54 -05:00
9dafe52a63 fix typo (#141) 2017-11-19 12:56:42 -05:00
2e5498cd5c New Topic for 'Stashing' and curated frequent stash workflow (#140) 2017-11-19 03:34:21 -05:00
5599a75b7f added another command to see staged diff (#139)
This command is an alternative to view all the changes in the staged files.
2017-11-18 13:56:47 -05:00