summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* revert: allow reverting a root commitJeff King2011-05-161-3/+1
* cherry-pick: handle root commits with external strategiesJeff King2011-05-161-2/+10
* Update draft release notes to 1.7.5.2Junio C Hamano2011-05-151-0/+9
* Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2011-05-152-7/+14
|\
| * format-patch: document --quiet optionCarlos Martín Nieto2011-04-121-1/+4
| * format-patch: don't pass on the --quiet flagCarlos Martín Nieto2011-04-121-6/+10
* | Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2011-05-152-9/+371
|\ \
| * | mergetool: Teach about submodulesJonathon Mah2011-04-132-9/+371
* | | Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2011-05-152-1/+102
|\ \ \
| * | | pretty: quote rfc822 specials in email addressesJeff King2011-04-262-1/+102
* | | | Merge branch 'vh/git-svn-doc' into maintJunio C Hamano2011-05-151-11/+11
|\ \ \ \
| * | | | git-svn.txt: small typeface improvementsValentin Haenel2011-04-261-4/+4
| * | | | git-svn.txt: move option descriptionsValentin Haenel2011-04-261-11/+11
| * | | | git-svn.txt: fix usage of --add-author-fromValentin Haenel2011-04-261-1/+1
* | | | | git_open_noatime(): drop unused parameterJunio C Hamano2011-05-151-8/+7
* | | | | sha1_file: typofixJunio C Hamano2011-05-151-1/+1
* | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-143-6/+6
* | | | | Prepare for 1.7.5.2Junio C Hamano2011-05-132-1/+34
* | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2011-05-132-2/+32
|\ \ \ \ \
| * | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-282-2/+32
| | |/ / / | |/| | |
* | | | | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-133-3/+14
|\ \ \ \ \
| * | | | | t/annotate-tests: Use echo & cat instead of sedBrian Gernhardt2011-05-051-1/+2
| * | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-293-3/+13
| | |/ / / | |/| | |
* | | | | Merge branch 'gr/cvsimport-alternative-cvspass-location' into maintJunio C Hamano2011-05-131-12/+41
|\ \ \ \ \
| * | | | | Look for password in both CVS and CVSNT password files.Guy Rouillier2011-05-011-12/+41
* | | | | | Merge branch 'cj/p4merge' into maintJunio C Hamano2011-05-131-6/+3
|\ \ \ \ \ \
| * | | | | | Pass empty file to p4merge where no base is suitable.Ciaran Jessup2011-05-011-6/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano2011-05-132-1/+106
|\ \ \ \ \ \
| * | | | | | merge-one-file: fix broken merges with alternate work treesJeff King2011-04-292-3/+8
| * | | | | | add tests for merge-index / merge-one-fileJeff King2011-04-291-0/+100
* | | | | | | Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-1316-36/+120
|\ \ \ \ \ \ \
| * | | | | | | diff-files: show unmerged entries correctlyJunio C Hamano2011-04-232-2/+95
| * | | | | | | diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-233-11/+6
| * | | | | | | diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-232-6/+9
| * | | | | | | test: use $_z40 from test-libJunio C Hamano2011-04-2312-22/+15
* | | | | | | | Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2011-05-132-2/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-232-2/+67
* | | | | | | | | t5400: Fix a couple of typosJohan Herland2011-05-131-2/+2
* | | | | | | | | Remove duplicated "is a"João Britto2011-05-051-1/+1
* | | | | | | | | t3701: fix here documentJunio C Hamano2011-05-051-3/+2
* | | | | | | | | git-fast-import.txt: --relative-marks takes no parameterMichael J Gruber2011-05-051-2/+2
* | | | | | | | | shell: add missing initialization of argv0_pathDima Sharov2011-05-051-0/+2
* | | | | | | | | Git 1.7.5.1v1.7.5.1Junio C Hamano2011-05-043-2/+36
* | | | | | | | | Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-048-12/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | --dirstat: In case of renames, use target filename instead of source filenameJohan Herland2011-04-121-1/+1
| * | | | | | | | | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-114-5/+21
| * | | | | | | | | --dirstat-by-file: Make it faster and more correctJohan Herland2011-04-113-5/+25
| * | | | | | | | | --dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland2011-04-116-7/+40
* | | | | | | | | | Merge branch 'sp/maint-clear-postfields' into maintJunio C Hamano2011-05-041-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http: clear POSTFIELDS when initializing a slotJunio C Hamano2011-04-261-0/+1