?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge branch 'jk/commit-date-approxidate'
2014-05-20 Felipe Contrerascontrib: remote-helpers: add move warnings (v2.0)
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-05-13 Felipe Contrerascontrib: completion: fix 'eread()' namespace
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-30 Felipe Contrerasrerere: fix for merge.conflictstyle
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-22 Felipe Contrerasmerge: enable defaulttoupstream by default
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-22 Felipe Contrerasmergetool: run prompt only if guessed tool
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-22 Felipe Contrerasmergetools: add vimdiff3 mode
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-21 Felipe Contrerast5801 (remote-helpers): cleanup environment sets
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-14 Felipe Contrerastransport-helper: fix sync issue on crashes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-14 Felipe Contrerastransport-helper: trivial cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-14 Felipe Contrerastransport-helper: propagate recvline() error pushing
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-14 Felipe Contrerasremote-helpers: make recvline return an error
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-14 Felipe Contrerastransport-helper: remove barely used xchgline()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-14 Felipe Contrerasprompt: fix missing file errors in zsh
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-14 Felipe Contrerasremote-bzr: trivial test fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-09 Felipe Contrerascompletion: fix completing args of aliased "push",...
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-09 Felipe Contrerasremote-bzr: add support for older versions
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-09 Felipe Contrerasremote-hg: always normalize paths
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2014-04-09 Felipe Contrerasremote-helpers: allow all tests running from any dir
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-12-09 Felipe Contrerasremote: fix status with branch...rebase=preserve
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-12-09 Felipe Contrerasfetch: add missing documentation
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-12-09 Felipe Contrerast: trivial whitespace cleanups
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-12-09 Felipe Contrerasabspath: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-12-09 Felipe Contrerasremote-hg: add tests for special filenames
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-12-09 Felipe Contrerasremote-hg: fix 'shared path' path
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-12-09 Felipe Contrerasremote-helpers: add extra safety checks
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-11-18 Felipe Contrerastest-bzr.sh, test-hg.sh: allow running from any dir
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-11-18 Felipe Contrerastest-lib.sh: convert $TEST_DIRECTORY to an absolute...
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-11-12 Felipe Contrerastransport-helper: check for 'forced update' message
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-11-12 Felipe Contrerastransport-helper: add 'force' to 'export' helpers
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerassetup: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerasrun-command: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerasdiff: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerasrevision: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contreraspretty: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerasdescribe: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerastransport-helper: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerassha1-name: trivial style cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerasbranch: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerasrevision: add missing include
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerastransport-helper: don't update refs in dry-run
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerastransport-helper: mismerge fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerast: replace pulls with merges
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-31 Felipe Contrerasmerge: simplify ff-only option
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-10-16 Felipe Contrerasalias: have SP around arithmetic operators
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-12 Felipe ContrerasAdd new @ shortcut for HEAD
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-03 Felipe Contrerasrev-parse test: use standard test functions for setup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-03 Felipe Contrerasrev-parse test: use test_must_fail, not "if <command...
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-03 Felipe Contrerasrev-parse test: modernize quoting and whitespace
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-03 Felipe Contrerasfast-export: refactor get_tags_and_duplicates()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-03 Felipe Contrerasfast-export: make extra_refs global
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-03 Felipe Contrerast: branch: fix broken && chains
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-03 Felipe Contrerast: branch: fix typo
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-03 Felipe Contrerast: branch: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-09-03 Felipe Contrerassha1-name: pass len argument to interpret_branch_name()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-31 Felipe Contrerasadd: trivial style cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-31 Felipe Contrerasreset: trivial style cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-31 Felipe Contrerasbranch: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-31 Felipe Contrerasreset: trivial refactoring
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-30 Felipe Contrerasremote-hg: use notes to keep track of Hg revisions
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-29 Felipe Contrerasremote-helpers: cleanup more global variables
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-29 Felipe Contrerasremote-helpers: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-29 Felipe Contrerasremote-hg: improve basic test
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-29 Felipe Contrerasremote-hg: add missing &&s in the test
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-29 Felipe Contrerasremote-hg: fix test
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-29 Felipe Contrerasremote-bzr: make bzr branches configurable per-repo
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-29 Felipe Contrerasremote-bzr: fix export of utf-8 authors
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-13 Felipe Contrerasunpack-trees: plug a memory leak
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-12 Felipe Contrerasremote-hg: add shared repo upgrade
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-08-12 Felipe Contrerasremote-hg: ensure shared repo is initialized
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-09 Felipe ContrerasMakefile: use $^ to avoid listing prerequisites on...
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-07 Felipe Contrerasbuild: do not install git-remote-testgit
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-07 Felipe Contrerasbuild: generate and clean test scripts
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-06 Felipe Contrerassequencer: avoid leaking message buffer when refusing...
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-03 Felipe Contrerassequencer: remove useless indentation
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-03 Felipe Contrerassha1_file: trivial style cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-03 Felipe Contrerasread-cache: trivial style cleanups
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-03 Felipe Contrerasread-cache: fix wrong 'the_index' usage
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-03 Felipe Contrerastest: fix post rewrite hook report
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-06-02 Felipe Contrerascompletion: avoid ls-remote in certain scenarios
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-29 Felipe Contrerascompletion: zsh: improve bash script loading
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-29 Felipe Contrerasprompt: fix for simple rebase
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerassend-email: remove warning about unset chainreplyto
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerastest: rebase: fix --interactive test
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerastest: trivial cleanups
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote: trivial style cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: add support for --force
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: add support for --dry-run
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: check if a fetch is needed
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: trivial cleanup
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-helpers: improve marks usage
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: add check_push() helper
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: add setup_big_push() helper
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: remove files before modifications
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: improve lightweight tag author
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: use remote 'default' not local one
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: improve branch listing
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: simplify branch_tip()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: check diverged bookmarks
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: pass around revision refs
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
2013-05-28 Felipe Contrerasremote-hg: implement custom checkheads()
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 commit | commitdiff | tree
next
ramsay's fork of git