?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
revision.c: don't show all merges for --parents
2013-05-16 Kevin Braceyrevision.c: don't show all merges for --parents
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceyrevision.c: discount side branches when computing TREESAME
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceyrevision.c: add BOTTOM flag for commits
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceysimplify-merges: drop merge from irrelevant side branch
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceysimplify-merges: never remove all TREESAME parents
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Junio C Hamanot6012: update test for tweaked full-history traversal
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceyrevision.c: Make --full-history consider more merges
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin BraceyDocumentation: avoid "uninteresting"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceyrev-list-options.txt: correct TREESAME for P
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceyt6111: add parents to tests
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Junio C Hamanot6111: allow checking the parents as well
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceyt6111: new TREESAME test set
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceyt6019: test file dropped in -s ours merge
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceydecorate.c: compact table when growing
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-16 Kevin Braceyrevision.c: treat A...B merge bases as if manually...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-13 Kevin Braceyt6019: demonstrate --ancestry-path A...B breakage
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-11 Torsten Bögershausentest-bzr: do not use unportable sed '\+'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-11 Junio C HamanoMerge git://git.bogomips.org/git-svn
 commit | commitdiff | tree
2013-05-09 Junio C HamanoSync with v1.8.2.3
 commit | commitdiff | tree
2013-05-09 Junio C HamanoGit 1.8.2.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-09 Junio C HamanoMerge branch 'mv/sequencer-pick-error-diag'
 commit | commitdiff | tree
2013-05-09 Junio C Hamanocherry-pick: picking a tag that resolves to a commit...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-09 Junio C HamanoMerge branch 'tr/copy-revisions-from-stdin' into maint
 commit | commitdiff | tree
2013-05-09 René Scharfet5004: avoid using tar for checking emptiness of archive
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-09 René Scharfet5004: ignore pax global header file
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-09 David Aguilarmergetools/kdiff3: do not use --auto when diffing
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-09 Felipe Contrerastransport-helper: trivial style cleanup
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-08 Junio C HamanoUpdate draft release notes for 1.8.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-08 Felipe Contrerasremote-helpers: trivial cleanup
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-08 Felipe Contrerasremote-bzr: fix for disappeared revisions
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-08 Junio C HamanoMerge git://github.com/git-l10n/git-po
 commit | commitdiff | tree
2013-05-07 Junio C HamanoMerge branch 'jk/merge-tree-added-identically'
 commit | commitdiff | tree
2013-05-07 John Keepingmerge-tree: handle directory/empty conflict correctly
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-07 Junio C HamanoMerge branch 'fc/remote-bzr'
 commit | commitdiff | tree
2013-05-07 Felipe Contrerasremote-bzr: avoid bad refs
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-06 Felipe Contrerasremote-bzr: convert all unicode keys to str
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-05 Junio C HamanoMerge branch 'fc/push-with-export-reporting-result'
 commit | commitdiff | tree
2013-05-05 Felipe Contrerastransport-helper: improve push messages
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-03 Junio C HamanoGit 1.8.3-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-03 Junio C HamanoMerge branch 'tr/unpack-entry-use-after-free-fix'
 commit | commitdiff | tree
2013-05-03 Junio C HamanoSync with maint
 commit | commitdiff | tree
2013-05-03 Junio C HamanoMerge branch 'tr/remote-tighten-commandline-parsing...
commit | commitdiff | tree
2013-05-03 Junio C HamanoMerge branch 'jn/glossary-revision' into maint
 commit | commitdiff | tree
2013-05-03 Felipe Contrerascompletion: zsh: don't override suffix on _detault
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-02 Anders Granskogen... Documentation/git-commit: Typo under --edit
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Junio C HamanoUpdate draft release notes to 1.8.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Marc BranchaudFix grammar in the 1.8.3 release notes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Junio C HamanoMerge branch 'hb/git-pm-tempfile'
 commit | commitdiff | tree
2013-05-01 Junio C HamanoMerge branch 'rs/pp-user-info-without-extra-allocation'
 commit | commitdiff | tree
2013-05-01 Junio C HamanoMerge branch 'tr/remote-tighten-commandline-parsing'
 commit | commitdiff | tree
2013-05-01 Junio C HamanoMerge branch 'zk/prompt-rebase-step'
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: access branches only when needed
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: delay peer branch usage
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: iterate revisions properly
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: improve progress reporting
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: add option to specify branches
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: add custom method to find branches
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: improve author sanitazion
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: add support for shared repo
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: fix branch names
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: add support for bzr repos
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: use branch variable when appropriate
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: fix partially pushed merge
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: fixes for branch diverge
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: add support to push merges
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: always try to update the worktree
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: fix order of locking in CustomTree
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: delay blob fetching until the very end
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-05-01 Felipe Contrerasremote-bzr: cleanup CustomTree
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-30 Thomas Rastunpack_entry: avoid freeing objects in base cache
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: add remote.pushdefault to config...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: add branch.*.pushremote to config...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-29 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2013-04-29 Junio C HamanoMerge branch 'fc/zsh-completion' into maint
 commit | commitdiff | tree
2013-04-29 Felipe Contrerascomplete: zsh: use zsh completion for the main cmd
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-29 Felipe Contrerascomplete: zsh: trivial simplification
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: complete branch.*.rebase as boolean
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: add diff.submodule to config list
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-29 Ramkumar Ramachandragit-completion.bash: lexical sorting for diff.statGraphWidth
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-29 H. Merijn BrandGit.pm: call tempfile from File::Temp as a regular...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-28 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2013-04-28 Felipe Contrerasdocumentation: trivial whitespace cleanups
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-28 John Keepingt/Makefile: remove smoke test targets
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-28 Junio C HamanoMerge branch 'nd/pretty-formats'
 commit | commitdiff | tree
2013-04-28 Ramsay Jonespretty: Fix bug in truncation support for %>, %< and %><
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-28 Junio C HamanoMerge branch 'jk/check-corrupt-objects-carefully'
 commit | commitdiff | tree
2013-04-28 Ramsay Jonesclone: Make the 'junk_mode' symbol a file static
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-28 Junio C HamanoMerge branch 'jk/merge-tree-added-identically'
 commit | commitdiff | tree
2013-04-28 John Keepingmerge-tree: fix typo in "both changed identically"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-27 Felipe Contrerascompletion: add missing format-patch options
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-26 Junio C HamanoGit 1.8.3-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-26 Junio C HamanoMerge branch 'rr/shortlog-doc'
 commit | commitdiff | tree
2013-04-26 Junio C HamanoMerge branch 'th/bisect-skipped-log'
 commit | commitdiff | tree
2013-04-26 Junio C HamanoMerge branch 'ph/rebase-original'
 commit | commitdiff | tree
2013-04-26 Junio C HamanoMerge branch 'jn/glossary-revision'
 commit | commitdiff | tree
2013-04-26 Junio C HamanoMerge branch 'jc/add-ignore-removal'
 commit | commitdiff | tree
2013-04-26 Felipe Contrerasremote-bzr: strip extra newline
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-26 Felipe Contrerasremote-bzr: tell bazaar to be quiet
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-26 Felipe Contrerasremote-bzr: store converted URL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
2013-04-26 Felipe Contrerasremote-hg: use hashlib instead of hg sha1 util
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 commit | commitdiff | tree
next
The Best VCS Around