Commit Graph

358 Commits

Author SHA1 Message Date
David Glasser 1eb620d54c Make amend commands more specific (#218)
Previously, this document the same command for "I wrote the wrong thing in a commit message" and "I need to add staged changes to the previous commit". These are different operations! Now, the former has a command that only changes the commit message (without adding staged changes), and the latter has commands to add staged changes with or without updating the commit message.

I also added "reword" and "extend" aliases to the sample gitconfig for using the two pieces of `git commit --amend` separately.
2018-10-23 14:24:26 +02:00
Nicolas Zachow 0b7921c8d5 I want to view the evolution of a function 2018-10-17 23:07:16 -03:00
grantslone 9bc656bdcc Added cred helper info 2018-10-17 15:28:13 -04:00
retiform d988a3ab10 add instructions for what to do if you add the wrong remote 2018-10-17 13:42:42 -04:00
hadongsoo 83261c5b7a Translate and add Korean (#215)
* make a readme

make a new readme for Korean

* git-flight-rule 번역 중간과정 01

브랜치 부분에서 한번 커밋

* git-flight-rule 번역 중간과정 02

머지 시작

* git-flight-rule 번역 1차 종료후 점검

* 점검 후 첫 완료

* 오타 수정 몇가지 수정

* 네비게이션 링크 추가

* 표현 수정
2018-09-13 14:20:07 -04:00
abdel ali c2ffba97eb I committed and pushed a merge that shouldn't have happened (#213) 2018-07-17 17:59:17 -04:00
Artem Buslov 8cfa8e476a Translate README_ru.md via GitLocalize (#210) 2018-07-09 16:50:20 -04:00
Richard Littauer df439158b4 fix link 2018-06-14 10:40:04 -04:00
Daryl 29a9c7cbca Rename README-es.md and add link to it from README.md (#212)
When viewing the git-flight-rules repository under gitlab, it lists the first README*.md file, which for some reason it sorts `-` before `.`.  This changes the Spanish README's filename to match the other two translations already in this repository.
2018-06-14 10:35:18 -04:00
Moisés Ñañez a06bef415e Add spanish translation (#119) 2018-05-14 12:40:45 -04:00
Richard Littauer 42472aaa94 Remove unnecessary tag 2018-05-14 12:37:08 -04:00
Filip Havrlent 0f16ad1e2d Issue #194 - Snippet to list changes (diff) of a specific file between two commits (or branches) 2018-05-14 12:37:08 -04:00
Richard Littauer 4f3582494d
Incorporate Git Cheatsheet (#174)
* Adding Git Cheatsheet commands

This is an example of how #90 should be done.

* Move other configuration commands

* Move configuration
2018-05-14 12:35:33 -04:00
Erik Martin-Dorel 4d42bb9070 Fix rule "i-want-to-create-a-new-remote-branch-from-current-local-one" (#208)
* Add missing HEAD argument in 2 Git commands

These commands had been inserted in #148 and (over)simplified in #163.

The issue is that `git push <remote>` and `git push -u <remote>` will
typically raise the error below (unlike `git push <remote> HEAD`):

--8<---------------cut here---------------start------------->8---
fatal: The current branch new-branch has no upstream branch.
To push the current branch and set the remote as upstream, use

    git push --set-upstream origin new-branch
--8<---------------cut here---------------end--------------->8---

* Add doc URL & Avoid triple backquotes
2018-02-20 15:14:13 -04:00
Gabriel Caruso d8c55ae8c5 Fix misspelling (#206) 2018-02-05 09:01:13 -04:00
Artem Buslov 14ea0820c8 Added test for TOC to .travis.yml (#205)
Runs doctoc for README*.md.
If in newly doctoc'ed README*.md there are any diffs against
ones commited in git HEAD then the test failes.
The script are using the latest anchor-markdown-header from repo
to avoid the bug with non-ASCII headers.
2018-01-13 22:00:59 -05:00
Artem Buslov ea40bf75ca Translate README_ru.md via GitLocalize (#203) 2018-01-11 08:57:04 -05:00
Gabriel Caruso fb27b20f1f Remove unnecessary anchor tags (#200) 2018-01-07 10:47:23 -05:00
Nick Kirby e0513d81c2 I made changes to the wrong branch (#202)
* I made changes to the wrong branch

* Missed from last commit

* Fixing links

* Making changes

* Another change

* Moving section
2018-01-07 10:46:31 -05:00
Emmanuel Arias be480c4c35
Merge pull request #201 from carusogabriel/patch-1
Possible mistake
2018-01-02 09:19:18 -03:00
Gabriel Caruso 3f85b185de
Possible mistake 2018-01-02 07:30:25 -02:00
Gabriel Caruso f9792e9c68 Clean up READMEs (#198)
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-01-01 11:40:52 -06:00
Richard Littauer 590f63c7e6 Add colon 2017-12-30 12:26:44 -06:00
vonglasow 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
Leandro Loriato 4dcb631734 Including snippet to list commits containing specific files (#197) 2017-12-30 12:57:11 -05:00
Gabriel Caruso e4e6ee08b1 Add "I want to delete multiple branches" (#196) 2017-12-30 12:25:11 -05:00
Artem Buslov 26138f0f10 Fixed typo in `git branch -rr` invocation (#190) 2017-12-29 09:52:07 -05:00
Artem Buslov 68820c1dc3 Auto-check for translated pages README_*.md with Travis CI (#188) 2017-12-23 10:51:19 -05:00
Artem Buslov 84322067fe Updated Russian translations (#187) 2017-12-23 10:50:23 -05:00
Eduardo Matos 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
Vitor Guilherme Forbrig 697dbb404f Update CONTRIBUTE.md (#185)
gitlocalize repository url
2017-12-22 09:41:14 -05:00
Kate Hudson 423eaf0ede
Merge pull request #183 from sotayamashita/feature/validate-links
Add travis config to validate links
2017-12-21 14:07:29 -05:00
Richard Littauer ae8459b6da Missed this grammar bit 2017-12-20 20:39:16 -05:00
Sam Yamashtia 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
Mike Melnicki ca04c4bfb4 Added the Atlassian Git tutorial site (#181) 2017-12-20 16:08:19 -05:00
Mike Melnicki 58fab97420 Fixed the typo for Sourcetree and updated the description (#180) 2017-12-19 22:12:56 -05:00
Sam Yamashita c91d1081c4 Add travis config to calidate links 2017-12-20 11:34:49 +09:00
Kate Hudson e5039cc2b9 Rename zh-CN translation to be compatible with GitLocalize (#178) 2017-12-19 19:47:46 -05:00
Richard Littauer 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
Siddharth Kannan 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
Dineshkumar Pandiyan da6f0f8e66 Branches - list branches (#171) 2017-12-16 11:50:00 -05:00
lxjwlt d6d5c6f920 fix a typo (#170) 2017-12-13 10:12:23 -05:00
Emmanuel Arias 4a6f537157
Merge pull request #166 from k88hudson/feat/set-head
Add an example using `set-head`
2017-12-12 13:06:54 -03:00
Clemens Lieb 8d74313257 Add reset-author and no-edit to author rewriting (#169) 2017-12-12 08:56:52 -05:00
JUAN CALVOPINA M 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
Artem Buslov 472f05caf0 Added section with links to every language (#167) 2017-12-10 14:07:30 -05:00
Richard Littauer 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
Kaartic Sivaraam 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
Artem Buslov 565b8259da Update Russian translations up to English source (#165) 2017-12-07 15:18:06 -05:00
Kaartic Sivaraam 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