| Age | Commit message (Collapse) | Author |
|---|
|
prepare() does not create merge commits if the _git_pull line within it
is commented out. The commenting out is recommended if merging upstream
master fails.
|
|
* prefix each custom variable name with an underscore;
* declare variables as local when possible.
|
|
The stable package version prevents unnecessary rebuilds by AUR helpers
and automated building repo servers.
|
|
add-toggle-scan-popup-cmd-line-option has been merged into upstream
master and therefore removed.
|
|
When git user.name and user.email are not configured in the user's
system, merging failed with the following error:
Committer identity unknown
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: unable to auto-detect email address (got '<username>@<hostname>.(none)')
|
|
Fixes the following error while pulling upstream master:
fatal: Need to specify how to reconcile divergent branches.
|
|
|