summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | Merge branch 'jk/maint-stash-oob' into maintJunio C Hamano2011-05-042-16/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash: fix false positive in the invalid ref test.Jon Seymour2011-04-051-5/+5
| * | | | | | | | | stash: fix accidental apply of non-existent stashesJeff King2011-04-052-11/+7
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/maint-upload-pack-shallow' into maintJunio C Hamano2011-05-041-12/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | upload-pack: start pack-objects before async rev-listJeff King2011-04-061-12/+11
* | | | | | | | | | Merge branch 'dm/stash-k-i-p' into maintJunio C Hamano2011-05-043-4/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: ensure --no-keep-index and --patch can be used in any orderDan McGee2011-04-072-5/+6
| * | | | | | | | | | stash: add two more tests for --no-keep-indexDan McGee2011-04-072-0/+20
* | | | | | | | | | | Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano2011-05-046-9/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Teach core.bigfilethreashold to pack-objectsJunio C Hamano2011-04-056-9/+14
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-042-13/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reflog: fix overriding of command line optionsMichael J Gruber2011-04-012-8/+3
| * | | | | | | | | | | t/t1411: test reflog with formatsMichael J Gruber2011-04-011-0/+18
| * | | | | | | | | | | builtin/log.c: separate default and setup of cmd_log_init()Michael J Gruber2011-04-011-6/+15
View Lorry Controller Status