summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-07-23Git 1.7.12-rc0v1.7.12-rc0Junio C Hamano2-1/+13
2012-07-23Merge branch 'jn/block-sha1'Junio C Hamano2-7/+6
2012-07-23Merge branch 'jn/make-assembly-in-right-directory'Junio C Hamano1-1/+1
2012-07-23Merge branch 'th/difftool-diffall'Junio C Hamano1-2/+5
2012-07-23Merge branch 'sl/autoconf'Junio C Hamano2-27/+46
2012-07-23Merge branch 'jv/maint-no-ext-diff'Junio C Hamano2-3/+64
2012-07-23Merge branch 'kk/maint-commit-tree'Junio C Hamano3-4/+18
2012-07-23Merge branch 'jk/mediawiki-credential'Junio C Hamano3-34/+22
2012-07-23Merge branch 'mm/mediawiki-usability'Junio C Hamano3-32/+116
2012-07-23Merge branch 'sn/doc-typofix'Junio C Hamano5-10/+10
2012-07-23Merge branch 'tg/ce-namelen-field'Junio C Hamano8-52/+65
2012-07-23Merge branch 'nk/maint-gitweb-log-by-lines'Junio C Hamano1-15/+18
2012-07-23Makefile: BLK_SHA1 does not require fast htonl() and unaligned loadsJonathan Nieder1-3/+2
2012-07-22Makefile: fix location of listing produced by "make subdir/foo.s"Jonathan Nieder1-1/+1
2012-07-22block-sha1: put expanded macro parameters in parenthesesJonathan Nieder1-2/+2
2012-07-22block-sha1: avoid pointer conversion that violates alignment constraintsJonathan Nieder1-3/+3
2012-07-22Update draft release notes to 1.7.12Junio C Hamano1-56/+24
2012-07-22Sync with 1.7.11.3Junio C Hamano2-1/+55
2012-07-22Git 1.7.11.3v1.7.11.3Junio C Hamano4-3/+57
2012-07-22Merge branch 'jk/push-delete-ref-error-message' into maintJunio C Hamano1-0/+3
2012-07-22Merge branch 'ar/clone-honor-umask-at-top' into maintJunio C Hamano3-3/+3
2012-07-22Merge branch 'cw/amend-commit-without-message' into maintJunio C Hamano2-1/+16
2012-07-22Merge branch 'jk/maint-commit-amend-only-no-paths' into maintJunio C Hamano2-1/+14
2012-07-22Merge branch 'tg/maint-cache-name-compare' into maintJunio C Hamano2-4/+48
2012-07-22Merge branch 'tr/maint-show-walk' into maintJunio C Hamano2-0/+94
2012-07-22Merge branch 'jc/refactor-diff-stdin' into maintJunio C Hamano4-50/+67
2012-07-22Merge branch 'mz/empty-rebase-test' into maintJunio C Hamano1-0/+8
2012-07-22Merge branch 'js/fast-export-paths-with-spaces' into maintJunio C Hamano2-1/+3
2012-07-22Merge branch 'cw/no-detaching-an-unborn' into maintJunio C Hamano2-0/+8
2012-07-22Merge branch 'vr/use-our-perl-in-tests' into maintJunio C Hamano26-44/+65
2012-07-22Merge git://bogomips.org/git-svnJunio C Hamano1-5/+4
2012-07-22Merge branch 'jk/revision-walk-stop-at-max-count'Junio C Hamano1-20/+19
2012-07-22Merge branch 'mm/config-xdg'Junio C Hamano2-6/+14
2012-07-22Merge branch 'as/t4012-style-updates'Junio C Hamano1-50/+44
2012-07-22Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano2-0/+8
2012-07-22Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink'Junio C Hamano2-2/+17
2012-07-22Merge branch 'ms/daemon-doc-typo'Junio C Hamano1-1/+1
2012-07-22Merge branch 'lk/more-helpful-status-hints'Junio C Hamano2-3/+1
2012-07-22Merge branch 'jc/sha1-name-more'Junio C Hamano15-172/+714
2012-07-22Merge branch 'jc/maint-filter-branch-epoch-date'Junio C Hamano4-5/+15
2012-07-19difftool: only copy back files modified during directory diffTim Henigan1-2/+5
2012-07-19build: reconfigure automatically if configure.ac changesStefano Lattarini2-0/+14
2012-07-19build: "make clean" should not remove configure-generated filesStefano Lattarini1-2/+3
2012-07-19autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'Stefano Lattarini1-11/+17
2012-07-19autoconf: remove few redundant semicolonsStefano Lattarini1-2/+2
2012-07-19autoconf: remove some redundant shell indirectionsStefano Lattarini1-7/+5
2012-07-19autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBSTStefano Lattarini1-12/+12
2012-07-19autoconf: GIT_CONF_APPEND_LINE: change signatureStefano Lattarini1-14/+14
2012-07-19diff: test precedence of external diff driversJeff King1-0/+40
2012-07-19git-svn: don't create master if another head existsMarcin Owsiany1-5/+4
2012-07-18mw-to-git: use git-credential's URL parserJeff King1-28/+4
2012-07-18credential: convert "url" attribute into its parsed subpartsJeff King2-0/+14
2012-07-18mw-to-git: check blank credential attributes via lengthJeff King1-1/+1
2012-07-18docs/credential: minor clarity fixupsJeff King1-6/+4
2012-07-17diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2-3/+24
2012-07-17Revert "git-commit-tree(1): update synopsis"Junio C Hamano1-1/+1
2012-07-17Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeJunio C Hamano2-3/+17
2012-07-17commit-tree: resurrect command line parsing updatesJunio C Hamano2-3/+17
2012-07-17git-remote-mediawiki: allow page names with a ':'Matthieu Moy2-16/+53
2012-07-17git-remote-mediawiki: fix incorrect test usage in testMatthieu Moy1-1/+1
2012-07-16t4012: Use test_must_fail instead of if-elseAlexander Strasser1-14/+2
2012-07-16t4012: use 'printf' instead of 'dd' to generate a binary fileJohannes Sixt1-1/+1
2012-07-16t4012: Re-indent test snippetsAlexander Strasser1-34/+34
2012-07-16t4012: Make --shortstat test more robustAlexander Strasser1-2/+2
2012-07-16t4012: Break up pipe into serial redirectionsAlexander Strasser1-1/+2
2012-07-16t4012: Actually quote the sed scriptAlexander Strasser1-2/+2
2012-07-16git-remote-mediawiki: properly deal with invalid remote revisionsMatthieu Moy1-4/+9
2012-07-16git-remote-mediawiki: show progress information when getting last remote revi...Matthieu Moy1-0/+2
2012-07-16git-remote-mediawiki: show progress information when listing pagesMatthieu Moy1-0/+3
2012-07-16git-remote-mediawiki: use --force when adding notesMatthieu Moy1-1/+1
2012-07-16git-remote-mediawiki: get rid of O(N^2) loopMatthieu Moy1-7/+17
2012-07-16git-remote-mediawiki: make mediafiles export optionalMatthieu Moy1-2/+22
2012-07-16git-remote-mediawiki: actually send empty comment when they're emptyMatthieu Moy1-1/+8
2012-07-16git-remote-mediawiki: don't split namespaces with spacesMatthieu Moy1-1/+1
2012-07-16config: fix several access(NULL) callsMatthieu Moy2-6/+14
2012-07-16Documentation/git-daemon: add missing wordMichael Schubert1-1/+1
2012-07-16status: color in-progress message like other header messagesJeff King2-3/+1
2012-07-15Update draft release notes for 7th batchJunio C Hamano1-0/+34
2012-07-15Merge branch 'tg/maint-cache-name-compare'Junio C Hamano2-4/+48
2012-07-15Merge branch 'jk/index-pack-streaming-fix'Junio C Hamano1-10/+13
2012-07-15Merge branch 'jk/maint-commit-amend-only-no-paths'Junio C Hamano2-1/+14
2012-07-15Merge branch 'cw/amend-commit-without-message'Junio C Hamano2-1/+16
2012-07-15Merge branch 'jn/makefile-cleanup'Junio C Hamano2-102/+131
2012-07-15Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano3-3/+3
2012-07-15Merge branch 'jc/apply-3way'Junio C Hamano4-118/+615
2012-07-15Merge branch 'cw/rebase-i-root'Junio C Hamano5-17/+74
2012-07-15Merge branch 'pw/git-p4-move'Junio C Hamano3-40/+72
2012-07-14doc: A few minor copy edits.Štěpán Němec5-10/+10
2012-07-13Merge branch 'pw/git-p4-jobs'Junio C Hamano4-88/+273
2012-07-13Merge branch 'jk/push-delete-ref-error-message'Junio C Hamano1-0/+3
2012-07-13am: indicate where a failed patch is to be foundPaul Gortmaker2-0/+8
2012-07-13Sixth batch for 1.7.12Junio C Hamano1-0/+33
2012-07-13Merge branch 'jc/refactor-diff-stdin'Junio C Hamano4-50/+67
2012-07-13Merge branch 'tg/ce-namelen'Junio C Hamano2-3/+3
2012-07-13Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano13-10/+446
2012-07-13Merge branch 'mm/mediawiki-tests'Junio C Hamano18-26/+2260
2012-07-13Merge branch 'jn/vcs-svn'Junio C Hamano9-43/+31
2012-07-13Merge branch 'mm/mediawiki-file-attachments'Junio C Hamano1-64/+386
2012-07-13Merge branch 'tr/maint-show-walk'Junio C Hamano2-0/+94
2012-07-13Merge branch 'mz/rebase-no-mbox'Junio C Hamano7-36/+66
2012-07-13revision: avoid work after --max-count is reachedJeff King1-20/+19
2012-07-13t1512: match the "other" object namesJunio C Hamano1-3/+3
2012-07-12git p4: add support for 'p4 move' in P4SubmitGary Gibbons2-16/+34
2012-07-12t7003: add test to filter a branch with a commit at epochJunio C Hamano2-3/+13
2012-07-12date.c: Fix off by one error in object-header date parsingJunio C Hamano1-1/+1
2012-07-12submodules: don't stumble over symbolic links when cloning recursivelyJens Lehmann2-2/+17
2012-07-11t1512: ignore whitespaces in wc -l outputJunio C Hamano1-1/+1
2012-07-11t4012: Unquote git command fragment in test titleAlexander Strasser1-1/+1
2012-07-11t4012: modernize style for quotingAlexander Strasser1-15/+20
2012-07-11Reduce draft release notes to 1.7.12Junio C Hamano1-61/+0
2012-07-11Sync with 1.7.11.2Junio C Hamano2-1/+55
2012-07-11Git 1.7.11.2v1.7.11.2Junio C Hamano4-3/+57
2012-07-11Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano1-4/+21
2012-07-11Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maintJunio C Hamano2-2/+10
2012-07-11Merge branch 'th/diff-no-index-fixes' into maintJunio C Hamano5-24/+112
2012-07-11Merge branch 'nd/clone-single-fix' into maintJunio C Hamano2-3/+11
2012-07-11Merge branch 'jc/rev-list-simplify-merges-first-parent' into maintJunio C Hamano1-12/+29
2012-07-11Merge branch 'hv/submodule-update-nuke-submodules' into maintJunio C Hamano1-6/+0
2012-07-11Merge branch 'jk/diff-no-index-pager' into maintJunio C Hamano3-15/+22
2012-07-11Merge branch 'mm/verify-filename-fix' into maintJunio C Hamano8-10/+44
2012-07-11Merge branch 'cn/cherry-pick-range-docs' into maintJunio C Hamano2-1/+13
2012-07-11Merge branch 'jc/ustar-checksum-is-unsigned' into maintJunio C Hamano1-3/+3
2012-07-11Merge branch 'jc/bundle-complete-notice' into maintJunio C Hamano1-6/+10
2012-07-11Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano6-10/+109
2012-07-11Merge branch 'jc/request-pull-match-tagname' into maintJunio C Hamano1-7/+22
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer8-51/+63
2012-07-11Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-fieldJunio C Hamano2-4/+48
2012-07-11cache_name_compare(): do not truncate while comparing pathsJunio C Hamano2-4/+48
2012-07-10index-pack: loop while inflating objects in unpack_dataJeff King1-10/+13
2012-07-10commit: fix "--amend --only" with no pathspecJeff King2-1/+14
2012-07-09apply: tests for the --3way optionJunio C Hamano1-0/+54
2012-07-09add: create ADD_EDIT.patch with mode 0666Jeff King1-1/+1
2012-07-09filter-branch: do not forget the '@' prefix to force git-timestampJunio C Hamano1-1/+1
2012-07-09rev-parse --disambiguate=<prefix>Junio C Hamano5-9/+78
2012-07-09rev-parse: A and B in "rev-parse A..B" refer to committishJunio C Hamano2-3/+3
2012-07-09reset: the command takes committishJunio C Hamano2-3/+9
2012-07-09commit-tree: the command wants a tree and commitsJunio C Hamano2-6/+6
2012-07-09apply: --build-fake-ancestor expects blobsJunio C Hamano2-2/+2
2012-07-09sha1_name.c: add support for disambiguating other typesJunio C Hamano3-5/+76
2012-07-09revision.c: the "log" family, except for "show", takes committishJunio C Hamano4-3/+15
2012-07-09revision.c: allow handle_revision_arg() to take other flagsJunio C Hamano3-8/+10
2012-07-09sha1_name.c: introduce get_sha1_committish()Junio C Hamano5-7/+25
2012-07-09sha1_name.c: teach lookup context to get_sha1_with_context()Junio C Hamano4-13/+18
2012-07-09sha1_name.c: many short names can only be committishJunio C Hamano3-5/+30
2012-07-09sha1_name.c: get_sha1_1() takes lookup flagsJunio C Hamano1-8/+8
2012-07-09sha1_name.c: get_describe_name() by definition groks only commitsJunio C Hamano2-1/+257
2012-07-09rerere: make rr-cache fanout directory honor umaskJunio C Hamano1-1/+1
2012-07-09apply: document --3way optionJunio C Hamano1-1/+10
2012-07-09apply: allow rerere() to work on --3way resultsJunio C Hamano2-0/+28
2012-07-09apply: register conflicted stages to the indexJunio C Hamano2-6/+138
2012-07-09apply: --3way with add/add conflictJunio C Hamano1-8/+62
2012-07-09apply: move verify_index_match() higherJunio C Hamano1-10/+10
2012-07-09apply: plug the three-way merge logic inJunio C Hamano1-3/+50
2012-07-09apply: fall back on three-way mergeJunio C Hamano1-1/+45
2012-07-09apply: accept -3/--3way command line optionJunio C Hamano2-2/+31
2012-07-09apply: move "already exists" logic to check_to_create()Junio C Hamano1-11/+29
2012-07-09apply: move check_to_create_blob() closer to its sole callerJunio C Hamano1-23/+23
2012-07-09apply: further split load_preimage()Junio C Hamano1-19/+40
2012-07-09apply: refactor "previous patch" logicJunio C Hamano1-26/+56
2012-07-09apply: split load_preimage() helper function outJunio C Hamano1-3/+12
2012-07-09apply: factor out checkout_target() helper functionJunio C Hamano1-7/+13
2012-07-09apply: refactor read_file_or_gitlink()Junio C Hamano1-7/+11
2012-07-09apply: clear_image() clears things a bit moreJunio C Hamano1-2/+2
2012-07-09apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano1-2/+8
2012-07-09apply: fix an incomplete comment in check_patch()Junio C Hamano1-9/+15
2012-07-09Restore umasks influence on the permissions of work tree created by cloneAlex Riesen1-1/+1
2012-07-09Allow edit of empty message with commit --amendChris Webb2-1/+16
2012-07-09Merge git://github.com/git-l10n/git-poJunio C Hamano5-1090/+1727
2012-07-09Fifth batch for 1.7.12Junio C Hamano1-0/+43
2012-07-09Merge branch 'cw/help-over-network'Junio C Hamano1-4/+15
2012-07-09Merge branch 'mz/empty-rebase-test'Junio C Hamano1-0/+8
2012-07-09Merge branch 'pw/git-p4-tests'Junio C Hamano9-433/+574
2012-07-09Merge branch 'js/fast-export-paths-with-spaces'Junio C Hamano2-1/+3
2012-07-09Merge branch 'cw/no-detaching-an-unborn'Junio C Hamano2-0/+8
2012-07-09Merge branch 'vr/use-our-perl-in-tests'Junio C Hamano26-44/+65
2012-07-09Merge branch 'mm/credential-plumbing'Junio C Hamano13-97/+330
2012-07-09Merge branch 'jc/maint-blame-unique-abbrev'Junio C Hamano1-4/+21
2012-07-09Merge branch 'jn/perl-makemaker-leading-paths'Junio C Hamano1-2/+14
2012-07-09Merge branch 'rj/platform-pread-may-be-thread-unsafe'Junio C Hamano2-2/+10
2012-07-09Merge branch 'mm/config-xdg'Junio C Hamano11-33/+272
2012-07-09Makefile: document ground rules for target-specific dependenciesJonathan Nieder1-0/+33
2012-07-09Makefile: move GIT-VERSION-FILE dependencies closer to useJeff King1-9/+4
2012-07-09Makefile: build instaweb similar to other scriptsJeff King1-8/+6
2012-07-09Makefile: update scripts when build-time parameters changeJeff King2-3/+14
2012-07-09Makefile: do not replace @@GIT_VERSION@@ in shell scriptsJeff King1-3/+0
2012-07-09Makefile: split prefix flags from GIT-CFLAGSJeff King2-8/+23
2012-07-09Makefile: be silent when only GIT_USER_AGENT changesJonathan Nieder1-1/+0
2012-07-09Makefile: split GIT_USER_AGENT from GIT-CFLAGSJeff King2-2/+10
2012-07-09Makefile: do not replace @@GIT_USER_AGENT@@ in scriptsJeff King1-1/+0
2012-07-09Makefile: apply dependencies consistently to sparse/asm targetsJeff King1-2/+2
2012-07-09Makefile: do not have git.o depend on common-cmds.hJeff King1-1/+0
2012-07-09Makefile: fold XDIFF_H and VCSSVN_H into LIB_HJonathan Nieder1-37/+25
2012-07-08git on Mac OS and precomposed unicodeTorsten Bögershausen13-10/+446
2012-07-08Replace strlen() with ce_namelen()Thomas Gummerer2-3/+3
2012-07-08git-remote-mediawiki: update comments to reflect credential supportMatthieu Moy1-6/+1
2012-07-06git-remote-mediawiki: be more defensive when requests failMatthieu Moy1-0/+8
2012-07-06git-remote-mediawiki: more efficient 'pull' in the best caseMatthieu Moy2-21/+110
2012-07-06git-remote-mediawiki: extract revision-importing loop to a functionMatthieu Moy1-3/+13
2012-07-06git-remote-mediawiki: refactor loop over revision idsMatthieu Moy1-6/+11
2012-07-06git-remote-mediawiki: change return type of get_mw_pagesMatthieu Moy1-3/+5