?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge git://ozlabs.org/~paulus/gitk
2014-01-07 Ramkumar Ramachandracompletion: complete format.coverLetter
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2014-01-06 Ramkumar Ramachandracompletion: fix remote.pushdefault
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2014-01-06 Ramkumar Ramachandracompletion: fix branch.autosetup(merge|rebase)
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2014-01-06 Ramkumar Ramachandracompletion: introduce __gitcomp_nl_append ()
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2014-01-06 Ramkumar Ramachandrazsh completion: find matching custom bash completion
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-12-30 Ramkumar Ramachandrafor-each-ref: remove unused variable
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-11-19 Ramkumar Ramachandrafor-each-ref: avoid color leakage
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-11-19 Ramkumar Ramachandrafor-each-ref: introduce %(color:...) for color
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-11-19 Ramkumar Ramachandrafor-each-ref: introduce %(upstream:track[short])
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-11-18 Ramkumar Ramachandrafor-each-ref: introduce %(HEAD) asterisk marker
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-11-18 Ramkumar Ramachandrat6300 (for-each-ref): don't hardcode SHA-1 hexes
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-11-18 Ramkumar Ramachandrat6300 (for-each-ref): clearly demarcate setup
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-07-30 Ramkumar Ramachandraquote: remove sq_quote_print()
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-07-30 Ramkumar Ramachandratar-tree: remove dependency on sq_quote_print()
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-07-29 Ramkumar Ramachandraeditor: use canonicalized absolute path
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-07-26 Ramkumar Ramachandraconfig doc: quote paths, fixing tilde-interpretation
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-07-18 Ramkumar Ramachandrasend-email: be explicit with SSL certificate verification
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-07-07 Ramkumar Ramachandraname-rev doc: rewrite --stdin paragraph
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-07-04 Ramkumar Ramachandrafixup-builtins: retire an old transition helper script
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-30 Ramkumar Ramachandracheck-ignore doc: fix broken link to ls-files page
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-26 Ramkumar Ramachandracolumn doc: rewrite documentation for column.ui
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-24 Ramkumar Ramachandracommit: make it work with status.short
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-24 Ramkumar Ramachandrat/t5528-push-default: test pushdefault workflows
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-24 Ramkumar Ramachandrat/t5528-push-default: generalize test_push_*
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-24 Ramkumar Ramachandrapush: change `simple` to accommodate triangular workflows
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-24 Ramkumar Ramachandrarebase -i: use a better reflog message
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-24 Ramkumar Ramachandrarebase: use a better reflog message
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-24 Ramkumar Ramachandraconfig doc: rewrite push.default section
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-23 Ramkumar Ramachandrat/t5505-remote: test multiple push/pull in remotes...
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-23 Ramkumar Ramachandrals-remote doc: don't encourage use of branches-file
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-23 Ramkumar Ramachandrals-remote doc: rewrite <repository> paragraph
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-23 Ramkumar Ramachandrals-remote doc: fix example invocation on git.git
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-23 Ramkumar Ramachandrat/t5505-remote: test url-with-# in branches-file
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-23 Ramkumar Ramachandraremote: remove dead code in read_branches_file()
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-23 Ramkumar Ramachandrat/t5505-remote: use test_path_is_missing
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-23 Ramkumar Ramachandrat/t5505-remote: test push-refspec in branches-file
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-23 Ramkumar Ramachandrat/t5505-remote: modernize style
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-21 Ramkumar Ramachandracompletion: complete diff --word-diff
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-20 Ramkumar Ramachandrat/t5528-push-default: remove redundant test_config...
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-19 Ramkumar Ramachandrasequencer: write useful reflog message for fast-forward
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandrarebase: use 'git stash store' to simplify logic
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandrastash: introduce 'git stash store'
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandracheckout: respect GIT_REFLOG_ACTION
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandrastatus: do not depend on rebase reflog messages
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandrat/t2021-checkout-last: "checkout -" should work after...
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandrawt-status: remove unused field in grab_1st_switch_cbdata
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandrastash: simplify option parser for create
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandrastash doc: document short form -p in synopsis
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandrastash doc: add a warning about using create
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandrat/am: use test_path_is_missing() where appropriate
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-17 Ramkumar Ramachandraam: handle stray $dotest directory
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-14 Ramkumar Ramachandrarebase: use peel_committish() where appropriate
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-14 Ramkumar Ramachandrash-setup: add new peel_committish() helper
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-14 Ramkumar Ramachandrat/rebase: add failing tests for a peculiar revision
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-14 Ramkumar Ramachandraprompt: squelch error output from cat
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-13 Ramkumar Ramachandrarebase: finish_rebase() in noop rebase
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-13 Ramkumar Ramachandrarebase: finish_rebase() in fast-forward rebase
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-13 Ramkumar Ramachandrarebase: guard against missing files in read_basic_state()
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-09 Ramkumar Ramachandracompletion: show can take both revlist and paths
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-03 Ramkumar Ramachandradiffcore-pickaxe doc: document -S and -G properly
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-03 Ramkumar Ramachandradiffcore-pickaxe: make error messages more consistent
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-03 Ramkumar Ramachandracompletion: difftool takes both revs and files
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-02 Ramkumar Ramachandracontrib: remove continuous/ and patches/
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-06-02 Ramkumar Ramachandrasha1_name: fix error message for @{<N>}, @{<date>}
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-29 Ramkumar Ramachandrapush: make push.default = current use resolved HEAD
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-29 Ramkumar Ramachandrapush: fail early with detached HEAD and current
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-29 Ramkumar Ramachandrapush: factor out the detached HEAD error message
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-29 Ramkumar Ramachandrarebase: implement --[no-]autostash and rebase.autostash
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-22 Ramkumar Ramachandrasha1_name: fix error message for @{u}
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-17 Ramkumar Ramachandraprompt: colorize ZSH prompt
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-17 Ramkumar Ramachandraprompt: factor out gitstring coloring logic
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-17 Ramkumar Ramachandraprompt: introduce GIT_PS1_STATESEPARATOR
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-13 Ramkumar Ramachandrarebase --merge: return control to caller, for housekeeping
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-13 Ramkumar Ramachandrarebase -i: return control to caller, for housekeeping
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-13 Ramkumar Ramachandraam: return control to caller, for housekeeping
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-13 Ramkumar Ramachandrarebase: prepare to do generic housekeeping
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-13 Ramkumar Ramachandrarebase -i: don't error out if $state_dir already exists
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-13 Ramkumar Ramachandraam: tighten a conditional that checks for $dotest
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-08 Ramkumar Ramachandrasha1_name: check @{-N} errors sooner
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-08 Ramkumar Ramachandrasha1_name: don't waste cycles in the @-parsing loop
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-08 Ramkumar Ramachandratests: at-combinations: @{N} versus HEAD@{N}
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-05-08 Ramkumar Ramachandratests: at-combinations: increase coverage
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: add remote.pushdefault to config...
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: add branch.*.pushremote to config...
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: complete branch.*.rebase as boolean
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: add diff.submodule to config list
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: lexical sorting for diff.statGraphWidth
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-22 Ramkumar Ramachandrabuiltin/shortlog.c: make usage string consistent with log
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-22 Ramkumar Ramachandrabuiltin/log.c: make usage string consistent with doc
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-22 Ramkumar Ramachandragit-shortlog.txt: make SYNOPSIS match log, update OPTIONS
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-22 Ramkumar Ramachandragit-log.txt: rewrite note on why "--" may be required
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-22 Ramkumar Ramachandragit-log.txt: generalize <since>..<until>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-22 Ramkumar Ramachandragit-log.txt: order OPTIONS properly; move <since>....
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-22 Ramkumar Ramachandrarevisions.txt: clarify the .. and ... syntax
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-21 Ramkumar Ramachandragit-shortlog.txt: remove (-h|--help) from OPTIONS
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-02 Ramkumar Ramachandraremote.c: introduce branch.<name>.pushremote
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-02 Ramkumar Ramachandraremote.c: introduce remote.pushdefault
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-02 Ramkumar Ramachandraremote.c: introduce a way to have different remotes...
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-02 Ramkumar Ramachandrat5516 (fetch-push): update test description
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
2013-04-02 Ramkumar Ramachandraremote.c: simplify a bit of code using git_config_string()
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
 commit | commitdiff | tree
next
Michael J Gruber's git tree