?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
pull: change the description to "integrate" changes
2013-07-08 John Keepingpull: change the description to "integrate" changes
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-07-07 John Keepingpush: avoid suggesting "merging" remote changes
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-05-17 John Keepingdifftool: fix dir-diff when file does not exist in...
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-05-07 John Keepingmerge-tree: handle directory/empty conflict correctly
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-28 John Keepingt/Makefile: remove smoke test targets
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-28 John Keepingmerge-tree: fix typo in "both changed identically"
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-15 John Keepingtransport-helper: add 'signed-tags' capability
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-15 John Keepingtransport-helper: pass --signed-tags=warn-strip to...
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-15 John Keepingfast-export: add --signed-tags=warn-strip mode
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-15 John Keepingt/test-lib.sh: fix TRASH_DIRECTORY handling
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-08 John Keepingmerge-tree: don't print entries that match "local"
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-07 John Keepinggitremote-helpers(1): clarify refspec behaviour
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-05 John Keepingsubmodule: print graph output next to submodule log
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-05 John Keepingdiff: allow unstuck arguments with --diff-algorithm
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-05 John Keepinggit-merge(1): document diff-algorithm option to merge...
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-03 John Keepingbisect: avoid signed integer overflow
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-04-03 John Keepingdiffcore-break: don't divide by zero
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-29 John Keepingt7800: run --dir-diff tests with and without symlinks
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-29 John Keepingt7800: fix tests when difftool uses --no-symlinks
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-29 John Keepingt7800: don't hide grep output
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-29 John Keepingdifftool: don't overwrite modified files
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-29 John Keepingt7800: move '--symlinks' specific test to the end
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-27 John Keepingmerge-tree: fix typo in merge-tree.c::unresolved
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-24 John Keepingrefs.c: fix fread error handling
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-14 John Keepingentry: fix filter lookup
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-14 John Keepingt2003: modernize style
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-14 John Keepingdifftool --dir-diff: symlink all files matching the...
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-14 John Keepingdifftool: avoid double slashes in symlink targets
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-14 John Keepinggit-difftool(1): fix formatting of --symlink description
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-03-04 John KeepingRevert "graph.c: mark private file-scope symbols as...
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-25 John KeepingMakefile: make mandir, htmldir and infodir absolute
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-12 John Keepingrebase -i: respect core.commentchar
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-12 John Keepingcombine-diff.c: teach combined diffs about line prefix
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-12 John Keepingdiff.c: use diff_line_prefix() where applicable
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-12 John Keepingdiff: add diff_line_prefix function
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-12 John Keepingdiff.c: make constant string arguments const
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-12 John Keepingdiff: write prefix to the correct file
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-07 John Keepinggraph: output padding for merge subsequent parents
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-05 John Keepingt4038: add tests for "diff --cc --raw <trees>"
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-03 John Keepingbuiltin/apply: tighten (dis)similarity index parsing
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-03 John Keepingmergetool--lib: list user configured tools in '--tool...
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-02-01 John KeepingRename {git- => git}remote-helpers.txt
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-30 John KeepingCodingGuidelines: add Python coding guidelines
 commit | commitdiff | tree
2013-01-28 John Keepinggit-remote-testpy: fix path hashing on Python 3
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-28 John Keepingmergetool--lib: don't call "exit" in setup_tool
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepinggit-difftool: use git-mergetool--lib for "--tool-help"
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepinggit-mergetool: don't hardcode 'mergetool' in show_tool_help
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepinggit-mergetool: remove redundant assignment
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepinggit-mergetool: move show_tool_help to mergetool--lib
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepinggit-remote-testpy: call print as a function
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepinggit-remote-testpy: don't do unbuffered text I/O
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepinggit-remote-testpy: hash bytes explicitly
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepingsvn-fe: allow svnrdump_sim.py to run with Python 3
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepinggit_remote_helpers: use 2to3 if building with Python 3
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-25 John Keepinggit_remote_helpers: force rebuild if python version...
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-24 John Keepinggit-cvsimport.txt: cvsps-2 is deprecated
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-22 John Keepinggit-for-each-ref.txt: 'raw' is a supported date format
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-21 John Keepinggit_remote_helpers: fix input when running under Python 3
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-21 John Keepinggit_remote_helpers: allow building with Python 3
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-17 John Keepinggit-svn: teach find-rev to find near matches
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-09 John Keepinggit-fast-import(1): reorganise options
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-09 John Keepinggit-fast-import(1): combine documentation of --[no...
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-09 John Keepinggit-shortlog(1): document behaviour of zero-width wrap
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2013-01-08 John Keepinggit-fast-import(1): remove duplicate '--done' option
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2012-12-17 John KeepingDocumentation: don't link to example mail addresses
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
2012-04-09 John Keepingrebase -i continue: don't skip commits that only change...
Signed-off-by: John Keeping <john@keeping.me.uk>
 commit | commitdiff | tree
Jonathan Nieder’s miscellaneous git branches