summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)Author
2013-05-07Merge branch 'jk/merge-tree-added-identically'Junio C Hamano
2013-05-07merge-tree: handle directory/empty conflict correctlyJohn Keeping
2013-05-01Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano
2013-04-28Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano
2013-04-28clone: Make the 'junk_mode' symbol a file staticRamsay Jones
2013-04-28Merge branch 'jk/merge-tree-added-identically'Junio C Hamano
2013-04-28merge-tree: fix typo in "both changed identically"John Keeping
2013-04-26Merge branch 'rr/shortlog-doc'Junio C Hamano
2013-04-26Merge branch 'jc/add-ignore-removal'Junio C Hamano
2013-04-26Merge branch 'jc/warn-pathless-add-finishing-touches'Junio C Hamano
2013-04-26git add: avoid "-u/-A without pathspec" warning on stat-dirty pathsJunio C Hamano
2013-04-24Merge branch 'jk/remote-helper-with-signed-tags'Junio C Hamano
2013-04-24Sync with maintJunio C Hamano
2013-04-24Merge branch 'jc/merge-tag-object' into maintJunio C Hamano
2013-04-24remote: check for superfluous arguments in 'git remote add'Thomas Rast
2013-04-24cherry-pick/revert: make usage say '<commit-ish>...'Kevin Bracey
2013-04-23Merge branch 'nd/pretty-formats'Junio C Hamano
2013-04-23Merge branch 'kb/status-ignored-optim-2'Junio C Hamano
2013-04-23Merge branch 'jk/receive-pack-deadlocks-with-early-failure'Junio C Hamano
2013-04-22git add: rephrase -A/--no-all warningJunio C Hamano
2013-04-22git add: --ignore-removal is a better named --no-allJunio C Hamano
2013-04-22Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano
2013-04-22Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano
2013-04-22Merge branch 'as/clone-reference-with-gitfile'Junio C Hamano
2013-04-22Merge branch 'jc/add-2.0-delete-default' (early part)Junio C Hamano
2013-04-22Merge branch 'nd/checkout-keep-sparse'Junio C Hamano
2013-04-22Merge branch 'jk/chopped-ident'Junio C Hamano
2013-04-22builtin/shortlog.c: make usage string consistent with logRamkumar Ramachandra
2013-04-22builtin/log.c: make usage string consistent with docRamkumar Ramachandra
2013-04-22git add: rephrase the "removal will cease to be ignored" warningJunio C Hamano
2013-04-19receive-pack: close sideband fd on early pack errorsJeff King
2013-04-19Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)Junio C Hamano
2013-04-19Merge branch 'ap/strbuf-humanize'Junio C Hamano
2013-04-19Merge branch 'fc/branch-upstream-color'Junio C Hamano
2013-04-18pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy
2013-04-18Merge branch 'jk/merge-tree-added-identically'Junio C Hamano
2013-04-18Merge branch 'fc/send-email-annotate'Junio C Hamano
2013-04-18Merge branch 'kb/co-orphan-suggestion-short-sha1'Junio C Hamano
2013-04-18git add: rework the logic to warn "git add <pathspec>..." default changeJunio C Hamano
2013-04-17blame: handle broken commit headers gracefullyRené Scharfe
2013-04-17cat-file: print tags raw for "cat-file -p"Jeff King
2013-04-15Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano
2013-04-15Merge branch 'jk/show-branch-strbuf'Junio C Hamano
2013-04-15dir.c: git-status --ignored: don't scan the work tree twiceKarsten Blees
2013-04-15dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees
2013-04-15branch: colour upstream branchesFelipe Contreras
2013-04-15fast-export: add --signed-tags=warn-strip modeJohn Keeping
2013-04-15checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy
2013-04-15Merge branch 'po/help-guides'Junio C Hamano
2013-04-12Sync with 'maint'Junio C Hamano