Update with the upstream #1
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
remove duplicate checkout
add alias to git-feature
Why: * The old way of handling arguments could make it difficult to make non-breaking changes because to be able to handle more arguments than the '--above' argument, the logic would need to be heavily refactored and demand restrictions on argument order. This change addresses the need by: * Parse arguments in a cleaner way * Make the command more future proof with respect to arguments Notable change is the synopsis. Please the see man page.
This makes git effort less prone to failing if someone passes formatting options
Straighten up effort
The output of `git log` is not exactly in chronological order. The
default sort option (--date-order) is described in the man page as
follows:
Show no parents before all of its children are shown, but otherwise
show commits in the commit timestamp order.
The `uniq` program will only remove duplicate lines if they follow each
other. In order for this to work correctly, we need to ensure that the
list of dates is exactly in chronological order. There doesn't seem to
be a `git log` option to achieve this, but we can use the `sort`
program. I used reverse sort (`sort -r`) since the output will be roughly
reverse-sorted already.
It's also worth noting that the default --date-order option sorts by
commit date, but git-summary uses *author* date (%ai). Passing
--author-date-order doesn't fix this issue, though, so I didn't change
that.
At the time of writing, this change reduces the number of 'active days'
for git-extras.git from 367 to 331.
Alphabetized list
effort, summary: Correctly estimate the number of active days
add alias conflict prompt
Make sure git-authors doesn't return twice the same ones.
* bin/git-summary: here.
summary: beware of locale issues, and pass options to line-summary
Add possibility to also checkout pull requests based on GitHub urls
Makefile: escape $ used inside eval as shell variable
This avoids the need for a big repeated block of code.
Also uses "default color" instead of "black" for the low-activity things, so it still shows up on colorschemes that have dark backgrounds.
git-effort: use portable terminal escape sequences
Makefile: refactor is-git-repo inclusion logic
git-summary: protect against character encoding issues with LC_ALL=C
This was a regression introduced by the useage of `enabledelayedexpansion`, which results in `!` treated as variable identifier like `%`. The result was that git didn't treat the scripts as git commands...
This was happening earlier as well, but the error messages were the raw messages from the failed writes...
column.exe will be available in the next git release: git-for-windows/build-extra#92 Also convert tabs to spaces... Was mixed up to now :-/
Add BSD installation instructions.
Update windows install.cmd
Add "sync" command.
There is no pgrep in git for windows
Update git PR manual to mention URLs
Regerenate git-pr.html
Fix Typo in `git-clear` Documentation.
I am not a lawyer but according to http://www.copyright.gov/circs/circ01.pdf (See screenshot of relevant section below), mentioning the first year of publication in the copyright is a good thing  Mentioning 2010 as the first release happened at that time - https://github.com/tj/git-extras/releases/tag/0.0.1 Also adding `Contributors` to copyright because TJ Holowaychuk is not the only person owning copyright for the whole project. The copyright is collectively owned by all contributors, or more precisely: every contributor owns a copyright on the code he or she has contributed. The only way to retain full copyright over code is to ask for signing contributor's agreement before merging in changes. This is, in fact, what some companies who license commercially their free software do.
Mention initial copyright year and add contributors to copyright
Lee-W
pushed a commit
that referenced
this pull request
Jan 25, 2023
Prevents sed from returning an error for arguments containing filenames: $ git sed src/foo.c src/bar.c sed: -e expression #1, char 13: unknown option to `s'
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update with the upstream