| 2018-08-29 | .gitattributes: add conflict-marker-size for relevant... Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-29 | rerere: add note about files with existing conflict... Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-29 | rerere: mention caveat about unmatched conflict markers Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-06 | rerere: recalculate conflict ID when unresolved conflict... Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-06 | rerere: teach rerere to handle nested conflicts Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-06 | rerere: return strbuf from handle path Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-06 | rerere: factor out handle_conflict function Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-06 | rerere: only return whether a path has conflicts or not Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-06 | rerere: fix crash with files rerere can't handle Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-06 | rerere: add documentation for conflict normalization Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-08-06 | rerere: mark strings for translation Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-07-16 | rerere: wrap paths in output in sq Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-07-16 | rerere: lowercase error messages Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-07-16 | rerere: unify error messages when read_cache fails Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-06-01 | note git-security@googlegroups.com in more places Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-06-01 | SubmittingPatches: replace numbered attributes with... Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-04-30 | worktree: teach "add" to check out existing branches Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-04-30 | worktree: factor out dwim_branch function Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-04-30 | worktree: improve message when creating a new worktree Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-04-30 | worktree: remove extra members from struct add_opts Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-04-20 | completion: make stash -p and alias for stash push -p Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-04-20 | completion: stop showing 'save' for stash by default Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-04-12 | SubmittingPatches: mention the git contacts command Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-03-28 | git-stash.txt: remove extra square bracket Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-03-21 | stash: drop superfluos pathspec parameter Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-03-20 | stash push -u: don't create empty stash Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-03-20 | stash push: avoid printing errors Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-02-02 | reset --hard: make use of the pretty machinery Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-01-19 | travis: run tests with GIT_TEST_SPLIT_INDEX Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-01-19 | split-index: don't write cache tree with null oid entries Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-01-19 | read-cache: fix reading the shared index for other... Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-01-08 | oidset: don't return value from oidset_init Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2018-01-08 | stash: don't delete untracked files that match pathspec Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-12-06 | add worktree.guessRemote config option Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-12-06 | worktree: add --guess-remote flag to add subcommand Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-11-27 | t/README: document test_cmp_rev Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-11-27 | t/README: remove mention of adding copyright notices Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-11-27 | worktree: make add <path> <branch> dwim Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-11-27 | worktree: add --[no-]track option to the add subcommand Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-11-27 | worktree: add can be created from any commit-ish Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-11-27 | checkout: factor out functions to new lib file Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-10-27 | stash: remove now superfluos help for "stash push" Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-10-27 | stash: mark "git stash save" deprecated in the man... Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-10-27 | stash: replace "git stash save" with "git stash push... Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-10-04 | http-push: fix construction of hex value from path Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-09-14 | refs: strip out not allowed flags from ref_transaction_update Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-09-08 | read-cache: fix index corruption with index v4 Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-05-17 | completion: add git stash push Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-03-22 | stash: keep untracked files intact in stash -k Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-03-22 | stash: pass the pathspec argument to git reset Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-03-22 | stash: don't show internal implementation details Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-02-28 | stash: allow pathspecs in the no verb form Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-02-28 | stash: use stash_push for no verb form Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-02-28 | stash: teach 'push' (and 'create_stash') to honor pathspec Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-02-20 | stash: refactor stash_create Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-02-20 | stash: add test for the create command line arguments Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-02-20 | stash: introduce push verb Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2017-02-13 | Documentation/stash: remove mention of git reset -... Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-09-15 | add: modify already added files when --chmod is given Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-09-15 | read-cache: introduce chmod_index_entry Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-09-14 | update-index: add test for chmod flags Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-09-12 | add: document the chmod option Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-08-29 | blame: fix segfault on untracked files Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-02-16 | remote: use remote_is_configured() for add and rename Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-02-16 | remote: actually check if remote exits Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-02-16 | remote: simplify remote_is_configured() Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-02-16 | remote: use parse_config_key Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-01-19 | ls-remote: add support for showing symrefs Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-01-19 | ls-remote: use parse-options api Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-01-19 | ls-remote: fix synopsis Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-01-19 | ls-remote: document --refs option Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-01-19 | ls-remote: document --quiet option Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-01-12 | builtin/grep: add grep.fallbackToNoIndex config Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2016-01-11 | t7810: correct --no-index test Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2015-03-24 | t1501: fix test with split index Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2015-03-20 | read-cache: fix reading of split index Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2015-03-20 | t1700: make test pass with index-v4 Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2014-02-24 | read-cache: add index.version config variable Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2014-02-24 | test-lib: allow setting the index format version Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2014-02-24 | introduce GIT_INDEX_VERSION environment variable Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2013-12-16 | diff: avoid some nesting Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2013-12-16 | diff: add test for --no-index executed outside repo Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2013-12-12 | diff: don't read index when --no-index is given Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2013-12-12 | diff: move no-index detection to builtin/diff.c Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2013-08-20 | read-cache: use fixed width integer types Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2013-06-30 | perf-lib: fix start/stop of perf tests Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2013-05-22 | prompt: fix show upstream with svn and zsh Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2012-07-11 | Strip namelen out of ce_flags into a ce_namelen field Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |
| 2012-07-09 | Replace strlen() with ce_namelen() Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> |
diff | tree |