GitHub и GitHub Desktop — как делать commit

Как обновить новыми данными Git репозиторий. Другими словами как правильно коммитить (commit), иначе – вносить изменения и правки на гит. Разберем на примере программы GitHub Desktop.

GitHub Desktop

Вы сделали какое-то изменение в файлах, это сразу отразится в программе. В левой части будут показаны, какие файлы изменены в сравнении с тем, что находится в репозитории. Отмечаем галочкой нужные файлы.

Затем внизу в поле Summary заносим короткое описание изменений. При желании можно описать более подробно в окошке Description. Далее нажать «Commit to название ветки».

Последним действием в программе нажимаем на Fetch Origin вверху рабочей области, чтобы отправить изменения на сервер.

github.com

После отправки заходим на Github в ту ветку с которой вы работаете (куда отправили изменения). Там появится новая кнопка: Compare & pull request. Нажимаем на неё.

Следующим действием, уже в новом окне. Там где указан base: master выбираем нужную ветку либо оставляем master. А с правой стороны compare уже указана наша рабочая ветка.

Если в комментариях ничего нет или нужно добавить, здесь же пишем. Затем нажимаем Create pull request.

Если никаких конфликтов нет, то будет предложено совместить ветки. Это делается с помощью кнопки Merge pull request. Однако, если вы работаете в большой компании и не являетесь руководителем проекта, функцию совмещения ветки следует оставить тому, кто проект знает лучше. Пусть он проверит код за вами и затем сам сделает совмещение проектов.

Читайте также

На сайте отсутствует реклама! Значете почему?

Помогать людям — моё хобби. А навыки разработчика позволяют не парится нулевой монетизизацией этого сайта. Хотя.

Если вам помогла информация, то даже от доната в 40 рублей мне будет приятно. Докину немного, куплю латте в макдаке, вспомню за чей счет банкет и карма вам зачтется!

Но и просто оставленный комментарий благодарности ниже принесет мне улыбку радости 🙂

А если захочется написать всякие гадости с переходом на личности, да тоже не стесняйтесь, но обычно я отправляю такое в спам. Люблю, когда дома чисто.

Добавить комментарий Отменить ответ

Если возникнут вопросы пишите на электронную почту.

Committing and reviewing changes to your project

GitHub Desktop tracks all changes to all files as you edit them. You can decide how to group the changes to create meaningful commits.

In this article

About commits

Similar to saving a file that’s been edited, a commit records changes to one or more files in your branch. Git assigns each commit a unique ID, called a SHA or hash, that identifies:

• The specific changes
• When the changes were made
• Who created the changes

When you make a commit, you must include a commit message that briefly describes the changes. You can also add a co-author on any commits you collaborate on.

If the commits you make in GitHub Desktop are associated with the wrong account on GitHub, update the email address in your Git configuration using GitHub Desktop. For more information, see «Configuring Git for GitHub Desktop.»

1. Choosing a branch and making changes

Create a new branch, or select an existing branch by clicking

Current Branch on the toolbar and selecting the branch from the list.

Using your favorite text editor, such as Atom, make the necessary changes to files in your project.

2. Selecting changes to include in a commit

As you make changes to files in your text editor and save them locally, you will also see the changes in GitHub Desktop.

icon indicates removed files.

icon indicates modified files.

icon indicates added files.

To access stashed changes, click Stashed Changes.

To add all changes in all files to a single commit, keep the checkbox at the top of the list selected.

To add all changes in one or more files to a single commit, unselect the checkboxes next to the files you don’t want included, leaving only the files you want in the commit. You can toggle the checkbox with the Spacebar or Enter keys after selecting a file.

Creating a partial commit

If one file contains multiple changes, but you only want some of those changes to be included in a commit, you can create a partial commit. The rest of your changes will remain intact, so that you can make additional modifications and commits. This allows you to make separate, meaningful commits, such as keeping line break changes in a commit separate from code or prose changes.

Note: Split diff displays are currently in beta and subject to change.

To choose how your changes are displayed, in the top-right corner of the changed file, use

to select Unified or Split.

To exclude changed lines from your commit, click one or more changed lines so the blue disappears. The lines that are still highlighted in blue will be included in the commit.

3. Discarding changes

If you have uncommitted changes that you don’t want to keep, you can discard the changes. This will remove the changes from the files on your computer. You can discard all uncommitted changes in one or more files, or you can discard specific lines you added.

Discarded changes are saved in a dated file in the Trash. You can recover discarded changes until the Trash is emptied.

Discarding changes in one or more files

In the list of changed files, select the files where you want to discard the changes since the last commit. To select multiple files, click shift and click on the range of files you want to discard changes from.

Click Discard Changes or Discard Selected Changes to discard changes to one or more files, or Discard All Changes to discard changes to all files since the last commit.

To confirm the changes, review the files affected and click Discard Changes.

Discarding changes in one or more lines

You can discard one or more changed lines that are uncommitted.

Note: Discarding single lines is disabled in a group of changes that adds and removes lines.

To discard one added line, in the list of changed lines, right click on the line you want to discard and select Discard added line.

To discard a group of changed lines, right click the vertical bar to the right of the line numbers for the lines you want to discard, then select Discard added lines.

4. Write a commit message and push your changes

Once you’re satisfied with the changes you’ve chosen to include in your commit, write your commit message and push your changes. If you’ve collaborated on a commit, you can also attribute a commit to more than one author.

Note: By default, GitHub Desktop will push the tag that you create to your repository with the associated commit. For more information, see «Managing tags.»

At the bottom of the list of changes, in the Summary field, type a short, meaningful commit message. Optionally, you can add more information about the change in the Description field.

Optionally, to attribute a commit to another author, click the add co-authors icon and type the username(s) you want to include.

Under the Description field, click Commit to BRANCH.

If the branch you’re trying to commit to is protected, Desktop will warn you.

• To move your changes, click switch branches.
• To commit your changes to the protected branch, click Commit to BRANCH.

For more information about protected branches, see «About protected branches».

Click Push origin to push your local changes to the remote repository.

Help us make these docs great!

All GitHub docs are open source. See something that’s wrong or unclear? Submit a pull request.

Git Guides

git commit creates a commit, which is like a snapshot of your repository. These commits are snapshots of your entire repository at specific times. You should make new commits often, based around logical units of change. Over time, commits should tell a story of the history of your repository and how it came to be the way that it currently is. Commits include lots of metadata in addition to the contents and message, like the author, timestamp, and more.

How Git Commit Works

Commits are the building blocks of «save points» within Git’s version control.

Commits shape history

By using commits, you’re able to craft history intentionally and safely. You can make commits to different branches, and specify exactly what changes you want to include. Commits are created on the branch that you’re currently checked out to (wherever HEAD is pointing) so it’s always a good idea to run git status before making a commit, to check that you’re checked-out to the branch that you intend to be. Before you commit, you will need to stage any new changes that you’d like to include in the commit using git add [file] .

Commits are lightweight SHA hashes, objects within Git. As long as you’re working with text files, you won’t need to worry about how many files you have, how big they are, or how many commits you make. Git can handle it!

Committing in two phases

Commits have two phases to help you craft commits properly. Commits should be logical, atomic units of change that represent a specific idea. But, not all humans work that way. You may get carried away and end up solving two or three problems before you remember to commit! That’s OK — Git can handle that. Once you’re ready to craft your commits, you’ll use git add to specify the files that you’d like to «stage» for commit. Without adding any files, the command git commit won’t work. Git only looks to the staging area to find out what to commit. Staging, or adding, files, is possible through the command line, and also possible with most Git interfaces like GitHub Desktop by selecting the lines or files that you’d like to stage.

You can also use a handy command, git add -p , to walk through the changes and separate them out, even if they’re in the same file.

How to Use Git Commit

Common usages and options for Git Commit

• git commit : This starts the commit process, but since it doesn’t include a -m flag for the message, your default text editor will be opened for you to create the commit message. If you haven’t configured anything, there’s a good chance this will be VI or Vim. (To get out, press esc, then :w , and then Enter. :wink:)
• git commit -m «descriptive commit message» : This starts the commit process, and allows you to include the commit message at the same time.
• git commit -am «descriptive commit message» : In addition to including the commit message, this option allows you to skip the staging phase. The addition of -a will automatically stage any files that are already being tracked by Git (changes to files that you’ve committed before).
• git commit —amend : Replaces the most recent commit with a new commit. (More on this later!)

To see all of the possible options you have with git commit , check out Git’s documentation.

How to Undo Commits in Git

Sometimes, you may need to change history. You may need to undo a commit. If you find yourself in this situation, there are a few very important things to remember:

• If you are «undoing» a commit that exists on the remote, you could create big problems for your collaborators
• Undoing a commit on work that you only have locally is much safer

What can go wrong while changing history?

Changing history for collaborators can be problematic in a few ways. Imagine — You and another collaborator have the same repository, with the same history. But, they make a change that deletes the most recent commit. They continue new commits from the commit directly before that. Meanwhile, you keep working with the commit that the collaborator tried to delete. When they push, they’ll have to ‘force push’, which should show to them that they’re changing history. What do you think will happen when you try to push?

In dramatic cases, Git may decide that the histories are too different and the projects are no longer related. This is uncommon, but a big problem.

The most common result is that your git push would return the «deleted» commit to shared history. (First, you would git pull if you were working on the same branch, and then merge, but the results would be the same.) This means that whatever was so important to delete is now back in the repository. A password, token, or large binary file may return without ever alerting you.

git revert is the safest way to change history with Git. Instead of deleting existing commits, git revert looks at the changes introduced in a specific commit, then applies the inverse of those changes in a new commit. It functions as an «undo commit» command, without sacrificing the integrity of your repository’s history. git revert is always the recommended way to change history when it’s possible.

Sometimes, a commit includes sensitive information and needs to actually be deleted. git reset is a very powerful command that may cause you to lose work. By resetting, you move the HEAD pointer and the branch pointer to another point in time — maybe making it seem like the commits in between never happened! Before using git reset :

• Make sure to talk with your team about any shared commits
• Research the three types of reset to see which is right for you (—soft, —mixed, —hard)
• Commit any work that you don’t want to be lost intentionally — work that is committed can be gotten back, but uncommitted work cannot

If you’re changing history and undoing commits, you should know about git reflog . If you get into trouble, the reflog could get you out of trouble. The reflog is a log of every commit that HEAD has pointed to. So, for example, if you use git reset and unintentionally lose commits, you can find and access them with git reflog .

Updating Commits With Git Commit Amend

While git commit —amend does change history, it only changes the most recent commit on your current branch. This can be an extremely useful command for commits that:

• Haven’t been pushed to the remote yet
• Have a spelling error in the commit message
• Don’t contain the changes that you’d like to contain

Examples of Git Commit

Once you’ve staged the files that you want to include in your commit, you’re ready. Whether you commit in a tool like GitHub Desktop, or through your command line, the commit message is important. Commit messages should be short and descriptive of your change. If you are looking through your repository’s history, you’ll be guided by the commit messages, so they should tell a story. Commits in the command line can include the message with the following format:

• git commit -m «git commit message example»

Commit messages should be present tense and directive, like the following examples:

• git commit -m «create file structure for Git guides»
• git commit -m «translate Git cheat sheet into German»
• git commit -m «update broken URL to Git resources»

If you’d like to include more context in your commit messages, you can also include an extended commit message.

• git add [file] : Snapshots the file in preparation for versioning, adding it to the staging area.
• git status : Always a good idea, this command shows you what branch you’re on, what files are in the working or staging directory, and any other important information.
• git push : Uploads all local branch commits to the remote.
• git log : Browse and inspect the evolution of project files.

Get started with git and GitHub

Review code, manage projects, and build software alongside 40 million developers.