summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-04-26Git 1.8.3-rc0v1.8.3-rc0Junio C Hamano2-19/+9
2013-04-26Merge branch 'rr/shortlog-doc'Junio C Hamano5-22/+35
2013-04-26Merge branch 'th/bisect-skipped-log'Junio C Hamano2-0/+30
2013-04-26Merge branch 'ph/rebase-original'Junio C Hamano2-1/+8
2013-04-26Merge branch 'jn/glossary-revision'Junio C Hamano1-3/+1
2013-04-26Merge branch 'jc/add-ignore-removal'Junio C Hamano2-10/+23
2013-04-26remote-bzr: strip extra newlineFelipe Contreras1-0/+4
2013-04-26remote-bzr: tell bazaar to be quietFelipe Contreras1-0/+3
2013-04-26remote-bzr: store converted URLFelipe Contreras1-1/+12
2013-04-26remote-hg: use hashlib instead of hg sha1 utilFelipe Contreras1-2/+2
2013-04-26remote-bzr: add support to push URLsFelipe Contreras1-3/+13
2013-04-26remote-bzr: fix bad state issueFelipe Contreras1-0/+6
2013-04-26remote-hg: remove extra checkFelipe Contreras1-4/+0
2013-04-26remote-helpers: trivial cleanupsFelipe Contreras2-4/+5
2013-04-26Merge branch 'fc/remote-hg'Junio C Hamano3-36/+141
2013-04-26Merge branch 'fc/remote-bzr'Junio C Hamano1-5/+5
2013-04-26Merge branch 'jc/warn-pathless-add-finishing-touches'Junio C Hamano1-0/+2
2013-04-26git add: avoid "-u/-A without pathspec" warning on stat-dirty pathsJunio C Hamano1-0/+2
2013-04-26Sync with 1.8.2.2Junio C Hamano7-20/+54
2013-04-26Git 1.8.2.2v1.8.2.2Junio C Hamano3-2/+21
2013-04-26Merge branch 'jk/a-thread-only-dies-once' into maintJunio C Hamano3-6/+26
2013-04-26Merge branch 'jn/gitweb-install-doc' into maintJunio C Hamano2-8/+12
2013-04-26Merge branch 'fc/untracked-zsh-prompt' into maintJunio C Hamano1-1/+1
2013-04-26Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maintJunio C Hamano1-1/+4
2013-04-26Merge branch 'jk/chopped-ident' into maintJunio C Hamano5-99/+75
2013-04-26Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2-7/+29
2013-04-26Merge branch 'rs/empty-archive' into maintJunio C Hamano1-1/+1
2013-04-26Merge branch 'pe/pull-rebase-v-q' into maintJunio C Hamano2-1/+28
2013-04-26t7409: do not use export X=YTorsten Bögershausen1-4/+10
2013-04-26test-hg-hg-git.sh: do not use export X=YTorsten Bögershausen1-4/+6
2013-04-26test-hg-bidi.sh: do not use export X=YTorsten Bögershausen1-5/+6
2013-04-26t9501: do not use export X=YTorsten Bögershausen1-5/+10
2013-04-26t9020: do not use export X=YTorsten Bögershausen1-1/+2
2013-04-25remote-bzr: use proper push methodFelipe Contreras1-5/+5
2013-04-24Merge branch 'jk/remote-helper-with-signed-tags'Junio C Hamano7-6/+50
2013-04-24Sync with maintJunio C Hamano3-9/+20
2013-04-24Update draft release notes to 1.8.2.2Junio C Hamano1-0/+18
2013-04-24Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano2-2/+9
2013-04-24Merge branch 'sr/log-SG-no-textconv' into maintJunio C Hamano2-72/+86
2013-04-24Merge branch 'jc/merge-tag-object' into maintJunio C Hamano2-32/+81
2013-04-24completion: remove duplicate block for "git commit -c"Mårten Kongstad1-7/+0
2013-04-24cherry-pick/revert: make usage say '<commit-ish>...'Kevin Bracey1-2/+2
2013-04-23Merge git://github.com/git-l10n/git-poJunio C Hamano5-4102/+5212
2013-04-23rebase: find orig_head unambiguouslyPhil Hord2-1/+8
2013-04-23Update draft release notes to 1.8.3Junio C Hamano1-0/+19
2013-04-23Merge branch 'nd/pretty-formats'Junio C Hamano14-125/+648
2013-04-23Merge branch 'kb/status-ignored-optim-2'Junio C Hamano12-364/+455
2013-04-23Merge branch 'jn/gitweb-install-doc'Junio C Hamano2-8/+12
2013-04-23Merge branch 'fc/untracked-zsh-prompt'Junio C Hamano1-1/+1
2013-04-23Merge branch 'jk/receive-pack-deadlocks-with-early-failure'Junio C Hamano1-1/+4
2013-04-23bisect: Log possibly bad, skipped commits at bisection endTorstein Hegge2-0/+30
2013-04-22remote-hg: strip extra newlineFelipe Contreras1-0/+4
2013-04-22remote-hg: use marks instead of inlined filesFelipe Contreras1-8/+33
2013-04-22remote-hg: small performance improvementFelipe Contreras1-1/+2
2013-04-22remote-hg: allow refs with spacesFelipe Contreras1-8/+17
2013-04-22remote-hg: don't update bookmarks unnecessarilyFelipe Contreras1-0/+3
2013-04-22remote-hg: add support for schemes extensionFelipe Contreras1-1/+7
2013-04-22remote-hg: improve email sanitationFelipe Contreras2-6/+12
2013-04-22remote-hg: add custom local tag write codeFelipe Contreras1-1/+3
2013-04-22remote-hg: write tags in the appropriate branchFelipe Contreras1-2/+4
2013-04-22remote-hg: custom method to write tagsFelipe Contreras1-1/+32
2013-04-22remote-hg: add support for tag objectsFelipe Contreras1-3/+7
2013-04-22remote-hg: add branch_tip() helperFelipe Contreras1-3/+8
2013-04-22remote-hg: properly mark branches up-to-dateFelipe Contreras1-0/+4
2013-04-22remote-hg: use python urlparseFelipe Contreras1-4/+5
2013-04-22remote-hg: safer bookmark pushingFelipe Contreras1-0/+2
2013-04-22remote-helpers: avoid has_keyDusty Phillips2-2/+2
2013-04-22git add: rephrase -A/--no-all warningJunio C Hamano1-6/+6
2013-04-22git add: --ignore-removal is a better named --no-allJunio C Hamano2-4/+17
2013-04-22Sync with maintJunio C Hamano1-0/+25
2013-04-22Start preparing for 1.8.2.2Junio C Hamano2-1/+26
2013-04-22Merge branch 'ta/glossary' into maintJunio C Hamano32-111/+89
2013-04-22Merge branch 'jk/doc-http-backend' into maintJunio C Hamano3-1/+129
2013-04-22Merge branch 'jk/test-trash' into maintJunio C Hamano1-9/+9
2013-04-22Merge branch 'jk/daemon-user-doc' into maintJunio C Hamano1-0/+7
2013-04-22Merge branch 'jc/detached-head-doc' into maintJunio C Hamano1-3/+16
2013-04-22Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano1-9/+8
2013-04-22Merge branch 'js/rerere-forget-protect-against-NUL' into maintJunio C Hamano2-10/+36
2013-04-22Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano4-7/+41
2013-04-22Merge branch 'ap/combine-diff-ignore-whitespace' into maintJunio C Hamano2-7/+161
2013-04-22Merge branch 'jk/suppress-clang-warning' into maintJunio C Hamano2-2/+4
2013-04-22Merge branch 'tr/perl-keep-stderr-open' into maintJunio C Hamano2-4/+5
2013-04-22Merge branch 'lf/bundle-with-tip-wo-message' into maintJunio C Hamano2-1/+11
2013-04-22Merge branch 'jk/filter-branch-come-back-to-original' into maintJunio C Hamano2-2/+17
2013-04-22Merge branch 'rr/prompt-revert-head' into maintJunio C Hamano1-0/+2
2013-04-22Update draft release notes to 1.8.3Junio C Hamano1-0/+22
2013-04-22Merge branch 'as/clone-reference-with-gitfile'Junio C Hamano2-3/+26
2013-04-22Merge branch 'jc/add-2.0-delete-default' (early part)Junio C Hamano3-32/+103
2013-04-22Merge branch 'nd/checkout-keep-sparse'Junio C Hamano5-1/+40
2013-04-22Merge branch 'jk/chopped-ident'Junio C Hamano5-99/+75
2013-04-22Merge branch 'th/bisect-final-log'Junio C Hamano2-1/+25
2013-04-22Merge branch 'rs/archive-zip-raw-compression'Junio C Hamano1-2/+2
2013-04-22zlib: fix compilation failures with Sun C CompilaerStefano Lattarini1-2/+2
2013-04-22builtin/shortlog.c: make usage string consistent with logRamkumar Ramachandra1-3/+1
2013-04-22builtin/log.c: make usage string consistent with docRamkumar Ramachandra1-1/+1
2013-04-21git-shortlog.txt: make SYNOPSIS match log, update OPTIONSRamkumar Ramachandra1-2/+17
2013-04-21git-log.txt: rewrite note on why "--" may be requiredRamkumar Ramachandra1-2/+2
2013-04-21git-log.txt: generalize <since>..<until>Ramkumar Ramachandra1-7/+9
2013-04-21git-log.txt: order OPTIONS properly; move <since>..<until>Ramkumar Ramachandra1-7/+7
2013-04-21revisions.txt: clarify the .. and ... syntaxRamkumar Ramachandra1-2/+4
2013-04-21git add: rephrase the "removal will cease to be ignored" warningJunio C Hamano1-7/+14
2013-04-21glossary: a revision is just a commitJonathan Nieder1-3/+1
2013-04-21Merge branch 'ta/glossary'Junio C Hamano32-111/+89
2013-04-21Merge branch 'jk/doc-http-backend'Junio C Hamano3-1/+129
2013-04-21Merge branch 'jx/i18n-branch-error-messages'Junio C Hamano1-27/+27
2013-04-21Merge branch 'fc/remote-hg'Junio C Hamano4-29/+148
2013-04-21Merge branch 'lf/read-blob-data-from-index'Junio C Hamano4-59/+39
2013-04-21prompt: fix untracked files for zshFelipe Contreras1-1/+1
2013-04-21git-shortlog.txt: remove (-h|--help) from OPTIONSRamkumar Ramachandra1-4/+0
2013-04-20l10n: de.po: translate 54 new messagesRalf Thielow1-828/+1062
2013-04-19receive-pack: close sideband fd on early pack errorsJeff King1-1/+4
2013-04-19Update draft release notes to 1.8.3Junio C Hamano1-1/+27
2013-04-19Merge branch 'jk/a-thread-only-dies-once'Junio C Hamano3-6/+26
2013-04-19Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano1-3/+3
2013-04-19Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano2-0/+24
2013-04-19Merge branch 'tr/copy-revisions-from-stdin'Junio C Hamano1-1/+2
2013-04-19Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)Junio C Hamano2-40/+95
2013-04-19Merge branch 'ap/strbuf-humanize'Junio C Hamano6-40/+86
2013-04-19Merge branch 'fc/branch-upstream-color'Junio C Hamano2-9/+30
2013-04-19Merge branch 'mv/ssl-ftp-curl'Junio C Hamano3-0/+27
2013-04-18pretty: support %>> that steal trailing spacesNguyễn Thái Ngọc Duy5-2/+54
2013-04-18pretty: support truncating in %>, %< and %><Nguyễn Thái Ngọc Duy5-5/+140
2013-04-18pretty: support padding placeholders, %< %> and %><Nguyễn Thái Ngọc Duy3-1/+246
2013-04-18pretty: add %C(auto) for auto-coloringNguyễn Thái Ngọc Duy2-4/+25
2013-04-18pretty: split color parsing into a separate functionNguyễn Thái Ngọc Duy1-32/+39
2013-04-18pretty: two phase conversion for non utf-8 commitsNguyễn Thái Ngọc Duy2-8/+28
2013-04-18utf8.c: add reencode_string_len() that can handle NULs in stringNguyễn Thái Ngọc Duy3-7/+24
2013-04-18utf8.c: add utf8_strnwidth() with the ability to skip ansi sequencesNguyễn Thái Ngọc Duy2-6/+15
2013-04-18utf8.c: move display_mode_esc_sequence_len() for use by other functionsNguyễn Thái Ngọc Duy1-14/+14
2013-04-18pretty: share code between format_decoration and show_decorationsNguyễn Thái Ngọc Duy4-38/+39
2013-04-18pretty-formats.txt: wrap long linesNguyễn Thái Ngọc Duy1-6/+12
2013-04-18pretty: get the correct encoding for --pretty:format=%eNguyễn Thái Ngọc Duy1-6/+7
2013-04-18pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy5-7/+16
2013-04-18Update draft release notes to 1.8.3Junio C Hamano1-1/+25
2013-04-18Merge branch 'maint'Junio C Hamano1-1/+2
2013-04-18Merge branch 'jk/test-trash'Junio C Hamano1-9/+9
2013-04-18Merge branch 'th/t9903-symlinked-workdir'Junio C Hamano1-5/+5
2013-04-18Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2-23/+13
2013-04-18Merge branch 'jk/http-dumb-namespaces'Junio C Hamano3-4/+63
2013-04-18Merge branch 'rs/empty-archive'Junio C Hamano1-1/+1
2013-04-18Merge branch 'fc/send-email-annotate'Junio C Hamano7-90/+136
2013-04-18Merge branch 'jc/push-2.0-default-to-simple' (early part)Junio C Hamano12-16/+24
2013-04-18Merge branch 'jk/daemon-user-doc'Junio C Hamano1-0/+7
2013-04-18Merge branch 'fc/completion'Junio C Hamano2-47/+96
2013-04-18Merge branch 'kb/co-orphan-suggestion-short-sha1'Junio C Hamano1-1/+1
2013-04-18Merge branch 'jc/detached-head-doc'Junio C Hamano1-3/+16
2013-04-18Merge branch 'tr/packed-object-info-wo-recursion'Junio C Hamano1-145/+266
2013-04-18Merge branch 'jk/http-error-messages'Junio C Hamano1-1/+1
2013-04-18t6200: avoid path mangling issue on WindowsJohannes Sixt1-3/+3
2013-04-17remote-hg: fix commit messagesFelipe Contreras1-1/+2
2013-04-17git add: rework the logic to warn "git add <pathspec>..." default changeJunio C Hamano1-26/+38
2013-04-17gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibilityJonathan Nieder1-0/+7
2013-04-17blame: handle broken commit headers gracefullyRené Scharfe1-3/+8
2013-04-17pretty: handle broken commit headers gracefullyRené Scharfe2-21/+66
2013-04-17cat-file: print tags raw for "cat-file -p"Jeff King2-75/+1
2013-04-17convert.c: remove duplicate codeLukas Fleischer1-25/+2
2013-04-17read_blob_data_from_index(): optionally return the size of blob dataLukas Fleischer3-4/+6
2013-04-17attr.c: extract read_index_data() as read_blob_data_from_index()Lukas Fleischer3-34/+35
2013-04-16Merge branch 'maint'Junio C Hamano1-0/+4
2013-04-16run-command: use thread-aware die_is_recursing routineJeff King1-0/+11
2013-04-16usage: allow pluggable die-recursion checksJeff King2-6/+15
2013-04-16help.c: add a compatibility comment to cmd_version()David Aguilar1-0/+4
2013-04-16convert: The native line-ending is \r\n on MinGWJonathan Nieder1-0/+1
2013-04-16read_revisions_from_stdin: make copies for handle_revision_argThomas Rast1-1/+2
2013-04-16http: set curl FAILONERROR each time we select a handleJeff King1-1/+1
2013-04-15i18n: branch: mark strings for translationJiang Xin1-27/+27
2013-04-15remote-bzr: fix prefix of tagsFelipe Contreras1-3/+6
2013-04-15Update draft release notes to 1.8.3Junio C Hamano1-0/+25
2013-04-15Merge branch 'jk/diff-graph-submodule-summary'Junio C Hamano3-4/+11
2013-04-15Merge branch 'jk/diff-algo-finishing-touches'Junio C Hamano2-2/+9
2013-04-15Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2-7/+29
2013-04-15Merge branch 'lf/bundle-with-tip-wo-message'Junio C Hamano2-1/+11
2013-04-15Merge branch 'jk/show-branch-strbuf'Junio C Hamano1-9/+8
2013-04-15Merge branch 'jk/http-error-messages'Junio C Hamano4-23/+76
2013-04-15Merge branch 'tr/perl-keep-stderr-open'Junio C Hamano2-4/+5
2013-04-15dir.c: git-status --ignored: don't scan the work tree twiceKarsten Blees5-22/+41
2013-04-15dir.c: git-status --ignored: don't scan the work tree three timesKarsten Blees1-74/+72
2013-04-15dir.c: git-status: avoid is_excluded checks for tracked filesKarsten Blees1-27/+11
2013-04-15dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees7-116/+16
2013-04-15dir.c: unify is_excluded and is_path_excluded APIsKarsten Blees2-67/+46
2013-04-15dir.c: move prep_excludeKarsten Blees1-72/+72
2013-04-15dir.c: factor out parts of last_exclude_matching for later reuseKarsten Blees1-14/+22
2013-04-15dir.c: git-clean -d -X: don't delete tracked directoriesKarsten Blees4-11/+66
2013-04-15dir.c: make 'git-status --ignored' work within leading directoriesKarsten Blees2-0/+22
2013-04-15dir.c: git-status --ignored: don't list empty directories as ignoredKarsten Blees2-4/+27
2013-04-15dir.c: git-ls-files --directories: don't hide empty directoriesKarsten Blees3-5/+26
2013-04-15dir.c: git-status --ignored: don't list empty ignored directoriesKarsten Blees2-7/+28
2013-04-15dir.c: git-status --ignored: don't list files in ignored directoriesKarsten Blees2-3/+28
2013-04-15dir.c: git-status --ignored: don't drop ignored directoriesKarsten Blees2-0/+36
2013-04-15glossary: improve definitions of refspec and pathspecThomas Ackermann1-23/+10
2013-04-15The name of the hash function is "SHA-1", not "SHA1"Thomas Ackermann31-68/+68
2013-04-15glossary: improve description of SHA-1 related topicsThomas Ackermann1-10/+10
2013-04-15glossary: remove outdated/misleading/irrelevant entriesThomas Ackermann1-10/+1
2013-04-15branch: colour upstream branchesFelipe Contreras2-9/+30
2013-04-15bisect: Store first bad commit as comment in log fileTorstein Hegge2-1/+25
2013-04-15transport-helper: add 'signed-tags' capabilityJohn Keeping4-2/+21
2013-04-15transport-helper: pass --signed-tags=warn-strip to fast-exportJohn Keeping2-1/+12
2013-04-15fast-export: add --signed-tags=warn-strip modeJohn Keeping3-5/+19
2013-04-15checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy5-1/+40
2013-04-15gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEMJakub Narębski1-8/+5