a5e5f399
|
415
|
die(_("'%s' cannot be used with updating paths"),
|
a5e5f399
|
425
|
die(_("'%s' cannot be used with %s"),
|
183fb44f
|
433
|
die(_("neither '%s' or '%s' is specified"),
|
183fb44f
|
437
|
die(_("'%s' must be used when '%s' is not specified"),
|
e3ddd3b5
|
442
|
die(_("'%s' or '%s' cannot be used with %s"),
|
e3ddd3b5
|
447
|
die(_("'%s' or '%s' cannot be used with %s"),
|
183fb44f
|
456
|
patch_mode = "--patch=reset";
|
2f0896ec
|
460
|
BUG("either flag must have been set, worktree=%d, index=%d",
|
183fb44f
|
536
|
die(_("unable to write new index file"));
|
1806c29f
|
656
|
BUG("'switch --orphan' should never accept a commit as starting point");
|
1806c29f
|
1039
|
BUG("'switch --orphan' should never accept a commit as starting point");
|
5c06e269
|
1176
|
die(_("only one reference expected"));
|
7968bef0
|
1300
|
const char *ref = to_free;
|
7968bef0
|
1302
|
if (skip_prefix(ref, "refs/tags/", &ref))
|
7968bef0
|
1303
|
die(_("a branch is expected, got tag '%s'"), ref);
|
7968bef0
|
1304
|
if (skip_prefix(ref, "refs/remotes/", &ref))
|
7968bef0
|
1305
|
die(_("a branch is expected, got remote branch '%s'"), ref);
|
7968bef0
|
1306
|
die(_("a branch is expected, got '%s'"), ref);
|
7968bef0
|
1314
|
die(_("a branch is expected, got '%s'"), branch_info->name);
|
c45f0f52
|
1329
|
die(_("cannot switch branch in the middle of an am session\n"
|
c45f0f52
|
1333
|
die(_("cannot switch branch while rebasing\n"
|
c45f0f52
|
1337
|
die(_("cannot switch branch while cherry-picking\n"
|
c45f0f52
|
1341
|
die(_("cannot switch branch while reverting\n"
|
d16dc428
|
1345
|
warning(_("you are switching branch while bisecting"));
|
3ec37ad1
|
1370
|
die(_("'%s' cannot be used with '%s'"), "--discard-changes", "--merge");
|
c9c935f6
|
1508
|
BUG("make up your mind, you need to take _something_");
|
183fb44f
|
1540
|
opts->checkout_index = 0;
|
183fb44f
|
1550
|
BUG("these flags should be non-negative by now");
|
c9c935f6
|
1611
|
die(_("could not resolve %s"), opts->from_treeish);
|
Ævar Arnfjörð Bjarmason
|
b4f207f3
|
env--helper: new undocumented builtin wrapping git_env_*()
|
Ævar Arnfjörð Bjarmason
|
2e43cd4c
|
config.c: refactor die_bad_number() to not call gettext() early
|
Ariadne Conill
|
f0596ecc
|
log: add warning for unspecified log.mailmap setting
|
Barret Rhoden
|
ae3f36de
|
blame: add the ability to ignore commits and their changes
|
Barret Rhoden
|
f93895f8
|
Move oidset_parse_file() to oidset.c
|
Barret Rhoden
|
1fc73384
|
blame: optionally track line fingerprints during fill_blame_origin()
|
Barret Rhoden
|
a07a9776
|
blame: use the fingerprint heuristic to match ignored lines
|
Daniel Ferreira
|
150791ad
|
dir-iterator: add tests for dir-iterator API
|
Denton Liu
|
13cdf780
|
format-patch: teach format.notes config option
|
Denton Liu
|
07b2c0ea
|
config: learn the "onbranch:" includeIf condition
|
Derrick Stolee
|
b2c83060
|
commit-graph: extract fill_oids_from_all_packs()
|
Derrick Stolee
|
4c9efe85
|
commit-graph: extract fill_oids_from_commit_hex()
|
Derrick Stolee
|
ef5b83f2
|
commit-graph: extract fill_oids_from_packs()
|
Derrick Stolee
|
6c622f9f
|
commit-graph: write commit-graph chains
|
Derrick Stolee
|
5c84b339
|
commit-graph: load commit-graph chains
|
Derrick Stolee
|
118bd570
|
commit-graph: add base graphs chunk
|
Derrick Stolee
|
1771be90
|
commit-graph: merge commit-graph chains
|
Derrick Stolee
|
2af890bb
|
multi-pack-index: prepare 'repack' subcommand
|
Derrick Stolee
|
3883c551
|
pull: add --[no-]show-forced-updates passthrough
|
Derrick Stolee
|
238def57
|
commit-graph: extract write_commit_graph_file()
|
Derrick Stolee
|
d4f4d60f
|
commit-graph: prepare for commit-graph chains
|
Derrick Stolee
|
c523035c
|
commit-graph: allow cross-alternate chains
|
Derrick Stolee
|
cdbd70c4
|
fetch: add --[no-]show-forced-updates argument
|
Derrick Stolee
|
377444b4
|
fetch: warn about forced updates in branch listing
|
Derrick Stolee
|
ce1e4a10
|
midx: implement midx_repack()
|
Derrick Stolee
|
19575c7c
|
multi-pack-index: implement 'expire' subcommand
|
Derrick Stolee
|
d01bf2e6
|
midx: refactor permutation logic and pack sorting
|
Derrick Stolee
|
8434e85d
|
repack: refactor pack deletion for future use
|
Derrick Stolee
|
e103f727
|
commit-graph: return with errors during write
|
Derrick Stolee
|
135a7123
|
commit-graph: add --split option to builtin
|
Derrick Stolee
|
c2bc6e6a
|
commit-graph: create options for split files
|
Dimitriy Ryazantcev
|
8f354a1f
|
l10n: localizable upload progress messages
|
Elijah Newren
|
e80001f8
|
fast-export: do automatic reencoding of commit messages only if requested
|
Emily Shaffer
|
de99eb0c
|
grep: fail if call could output and name is null
|
Eric Wong
|
f4f476b6
|
update-server-info: avoid needless overwrites
|
Jeff Hostetler
|
0a53561a
|
status: warn when a/b calculation takes too long
|
Jeff King
|
7bd9631b
|
read-cache: drop unused parameter from threaded load
|
Jeff King
|
709dfa69
|
object-store.h: move for_each_alternate_ref() from transport.h
|
Jeff King
|
62b89d43
|
upload-pack: rename a "sha1" variable to "oid"
|
Jeff King
|
d0229abd
|
object: convert lookup_object() to use object_id
|
Jeff King
|
bdbdf42f
|
delta-islands: respect progress flag
|
Jeff King
|
6e7baf24
|
am: drop tty requirement for --interactive
|
Jeff King
|
97387c8b
|
am: read interactive input from stdin
|
Jeff King
|
76a7bc09
|
cmd_{read,write}_tree: rename "unused" variable that is used
|
Johannes Schindelin
|
906b6394
|
rebase --am: ignore rebase.rescheduleFailedExec
|
Johannes Schindelin
|
7877ac3d
|
bisect--helper: verify HEAD could be parsed before continuing
|
Johannes Schindelin
|
b09364c4
|
clean: show an error message when the path is too long
|
Johannes Schindelin
|
08e04506
|
kwset: allow building with GCC 8
|
Matheus Tavares
|
14954b79
|
clone: extract function from copy_or_link_directory
|
Matheus Tavares
|
3012397e
|
dir-iterator: refactor state machine model
|
Matheus Tavares
|
fa1da7d2
|
dir-iterator: add flags parameter to dir_iterator_begin
|
Matheus Tavares
|
c9bba372
|
dir-iterator: use warning_errno when possible
|
Matheus Tavares
|
ff7ccc8c
|
clone: use dir-iterator to avoid explicit dir traversal
|
Matthew DeVore
|
28438e84
|
ref-filter: sort detached HEAD lines firstly
|
Matthew DeVore
|
5c03bc8b
|
list-objects-filter-options: error is localizeable
|
Nguyễn Thái Ngọc Duy
|
d16dc428
|
switch: allow to switch in the middle of bisect
|
Nguyễn Thái Ngọc Duy
|
3ec37ad1
|
switch: add --discard-changes
|
Nguyễn Thái Ngọc Duy
|
50ddb089
|
tree-walk.c: remove the_repo from get_tree_entry()
|
Nguyễn Thái Ngọc Duy
|
e3ddd3b5
|
restore: reject invalid combinations with --staged
|
Nguyễn Thái Ngọc Duy
|
2f0896ec
|
restore: support --patch
|
Nguyễn Thái Ngọc Duy
|
1806c29f
|
switch: make --orphan switch to an empty tree
|
Nguyễn Thái Ngọc Duy
|
5c06e269
|
switch: stop accepting pathspec
|
Nguyễn Thái Ngọc Duy
|
7968bef0
|
switch: only allow explicit detached HEAD
|
Nguyễn Thái Ngọc Duy
|
c45f0f52
|
switch: reject if some operation is in progress
|
Nguyễn Thái Ngọc Duy
|
a5e5f399
|
restore: replace --force with --ignore-unmerged
|
Nguyễn Thái Ngọc Duy
|
1de16aec
|
worktree add: sanitize worktree names
|
Nguyễn Thái Ngọc Duy
|
c9c935f6
|
restore: take tree-ish from --source option instead
|
Nguyễn Thái Ngọc Duy
|
5a88583b
|
fetch-pack: print all relevant supported capabilities with -v -v
|
Nguyễn Thái Ngọc Duy
|
f3f8311e
|
merge: add --quit
|
Nguyễn Thái Ngọc Duy
|
90d34051
|
match-trees.c: remove the_repo from shift_tree*()
|
Nguyễn Thái Ngọc Duy
|
d3b4705a
|
sha1-file.c: remove the_repo from read_object_with_reference()
|
Nguyễn Thái Ngọc Duy
|
0778b293
|
fetch-pack: move capability names out of i18n strings
|
Nguyễn Thái Ngọc Duy
|
183fb44f
|
restore: add --worktree and --staged
|
Nickolai Belakovski
|
2582083f
|
ref-filter: add worktreepath atom
|
Philip Oakley
|
1fde99cf
|
doc branch: provide examples for listing remote tracking branches
|
Phillip Wood
|
37e9ee5c
|
sequencer: return errors from sequencer_remove_state()
|
Phillip Wood
|
ed5b1ca1
|
status: do not report errors in sequencer/todo
|
Phillip Wood
|
d559f502
|
rebase --abort/--quit: cleanup refs/rewritten
|
René Scharfe
|
568a05c5
|
cleanup: fix possible overflow errors in binary search, part 2
|
René Scharfe
|
921d49be
|
use COPY_ARRAY for copying arrays
|
Rohit Ashiwal
|
de81ca3f
|
cherry-pick/revert: add --skip option
|
Rohit Ashiwal
|
6a1f9046
|
sequencer: add advice for revert
|
SZEDER Gábor
|
cd1096b2
|
pager: add a helper function to clear the last line in the terminal
|
SZEDER Gábor
|
5b12e312
|
progress: use term_clear_line()
|
Taylor Blau
|
b31e2680
|
ref-filter.c: find disjoint pattern prefixes
|
Thomas Gummerer
|
b66885a3
|
range-diff: add section header instead of diff header
|
Thomas Gummerer
|
44b67cb6
|
range-diff: split lines manually
|
Thomas Gummerer
|
85c3713d
|
apply: only pass required data to git_header_name
|