| 2014-05-27 | completion: add missing options for git-merge Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-05-27 | completion: add a note that merge options are shared Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-03-11 | builtin/mv: fix out of bounds write Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-02-18 | builtin/mv: don't use memory after free Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-02-18 | utf8: use correct type for values in interval table Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-02-18 | utf8: fix iconv error detection Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-02-18 | notes-utils: handle boolean notes.rewritemode correctly Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-01-27 | Makefile: remove redundant object in git-http{fetch... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-01-17 | pull: suppress error when no remoteref is found Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-01-13 | completion: handle --[no-]fork-point options to git... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-01-13 | completion: complete merge-base options Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2014-01-09 | rebase: fix fork-point with zero arguments Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-12-10 | rebase: use reflog to find common base with upstream Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-12-09 | pull: use merge-base --fork-point when appropriate Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-11-12 | peek-remote: remove deprecated alias of ls-remote Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-11-12 | lost-found: remove deprecated command Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-11-12 | tar-tree: remove deprecated command Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-11-12 | repo-config: remove deprecated alias for "git config" Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-10-03 | Documentation/Makefile: make AsciiDoc dblatex dir configurable Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-09-26 | merge-recursive: fix parsing of "diff-algorithm" option Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-09-13 | reset: handle submodule with trailing slash Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-09-13 | rm: re-use parse_pathspec's trailing-slash removal Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-09-09 | git_remote_helpers: remove little used Python library Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-07-22 | rev-parse(1): logically group options Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-07-22 | rev-parse: remove restrictions on some options Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-07-08 | pull: change the description to "integrate" changes Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-07-07 | push: avoid suggesting "merging" remote changes Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-07-07 | git-config(1): clarify precedence of multiple values Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-07-03 | git-config: update doc for --get with multiple values Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-30 | completion: learn about --man-path Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-30 | completion: handle unstuck form of base git options Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-23 | fast-import: allow moving the root tree Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-23 | fast-import: allow ls or filecopy of the root tree Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-23 | fast-import: set valid mode on root tree in "ls" Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-23 | t9300: document fast-import empty path issues Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-17 | submodule: drop the top-level requirement Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-17 | rev-parse: add --prefix option Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-17 | submodule: show full path in error message Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-17 | t7403: add missing && chaining Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-17 | t7403: modernize style Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-17 | t7401: make indentation consistent Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-17 | mergetool--lib: refactor {diff,merge}_cmd logic Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-17 | Documentation/Makefile: move infodir to be with other... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-17 | Documentation/Makefile: fix spaces around assignments Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-12 | add--interactive: respect diff.algorithm Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-06-07 | git-gui: fix file name handling with non-empty prefix Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-05-28 | fetch: don't try to update unfetched tracking refs Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-05-17 | difftool: fix dir-diff when file does not exist in... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-05-07 | merge-tree: handle directory/empty conflict correctly Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-05-06 | t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-05-01 | contrib/subtree: don't delete remote branches if split... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-29 | test output: respect $TEST_OUTPUT_DIRECTORY Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-28 | t/Makefile: remove smoke test targets Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-28 | merge-tree: fix typo in "both changed identically" Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-27 | t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-15 | transport-helper: add 'signed-tags' capability Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-15 | transport-helper: pass --signed-tags=warn-strip to... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-15 | fast-export: add --signed-tags=warn-strip mode Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-15 | t/test-lib.sh: fix TRASH_DIRECTORY handling Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-08 | merge-tree: don't print entries that match "local" Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-07 | gitremote-helpers(1): clarify refspec behaviour Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-05 | submodule: print graph output next to submodule log Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-05 | diff: allow unstuck arguments with --diff-algorithm Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-05 | git-merge(1): document diff-algorithm option to merge... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-03 | bisect: avoid signed integer overflow Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-04-03 | diffcore-break: don't divide by zero Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-29 | t7800: run --dir-diff tests with and without symlinks Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-29 | t7800: fix tests when difftool uses --no-symlinks Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-29 | t7800: don't hide grep output Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-29 | difftool: don't overwrite modified files Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-29 | t7800: move '--symlinks' specific test to the end Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-27 | merge-tree: fix typo in merge-tree.c::unresolved Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-24 | refs.c: fix fread error handling Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-14 | entry: fix filter lookup Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-14 | t2003: modernize style Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-14 | difftool --dir-diff: symlink all files matching the... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-14 | difftool: avoid double slashes in symlink targets Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-14 | git-difftool(1): fix formatting of --symlink description Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-03-04 | Revert "graph.c: mark private file-scope symbols as... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-25 | Makefile: make mandir, htmldir and infodir absolute Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-12 | rebase -i: respect core.commentchar Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-12 | combine-diff.c: teach combined diffs about line prefix Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-12 | diff.c: use diff_line_prefix() where applicable Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-12 | diff: add diff_line_prefix function Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-12 | diff.c: make constant string arguments const Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-12 | diff: write prefix to the correct file Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-07 | graph: output padding for merge subsequent parents Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-05 | t4038: add tests for "diff --cc --raw <trees>" Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-03 | builtin/apply: tighten (dis)similarity index parsing Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-03 | mergetool--lib: list user configured tools in '--tool... Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-02-01 | Rename {git- => git}remote-helpers.txt Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-01-30 | CodingGuidelines: add Python coding guidelines |
diff | tree |
| 2013-01-28 | git-remote-testpy: fix path hashing on Python 3 Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-01-28 | mergetool--lib: don't call "exit" in setup_tool Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-01-25 | git-difftool: use git-mergetool--lib for "--tool-help" Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-01-25 | git-mergetool: don't hardcode 'mergetool' in show_tool_help Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-01-25 | git-mergetool: remove redundant assignment Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-01-25 | git-mergetool: move show_tool_help to mergetool--lib Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-01-25 | git-remote-testpy: call print as a function Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |
| 2013-01-25 | git-remote-testpy: don't do unbuffered text I/O Signed-off-by: John Keeping <john@keeping.me.uk> |
diff | tree |