aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* git_open_noatime(): drop unused parameterJunio C Hamano2011-05-15
* sha1_file: typofixJunio C Hamano2011-05-15
* add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-14
* Prepare for 1.7.5.2Junio C Hamano2011-05-13
* Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2011-05-13
|\
| * git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-28
* | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-13
|\ \
| * | t/annotate-tests: Use echo & cat instead of sedBrian Gernhardt2011-05-05
| * | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-29
* | | Merge branch 'gr/cvsimport-alternative-cvspass-location' into maintJunio C Hamano2011-05-13
|\ \ \
| * | | Look for password in both CVS and CVSNT password files.Guy Rouillier2011-05-01
* | | | Merge branch 'cj/p4merge' into maintJunio C Hamano2011-05-13
|\ \ \ \
| * | | | Pass empty file to p4merge where no base is suitable.Ciaran Jessup2011-05-01
| | |/ / | |/| |
* | | | Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano2011-05-13
|\ \ \ \
| * | | | merge-one-file: fix broken merges with alternate work treesJeff King2011-04-29
| * | | | add tests for merge-index / merge-one-fileJeff King2011-04-29
* | | | | Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-13
|\ \ \ \ \
| * | | | | diff-files: show unmerged entries correctlyJunio C Hamano2011-04-23
| * | | | | diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-23
| * | | | | diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-23
| * | | | | test: use $_z40 from test-libJunio C Hamano2011-04-23
* | | | | | Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2011-05-13
|\ \ \ \ \ \
| * | | | | | diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-23
* | | | | | | t5400: Fix a couple of typosJohan Herland2011-05-13
* | | | | | | Remove duplicated "is a"João Britto2011-05-05
* | | | | | | t3701: fix here documentJunio C Hamano2011-05-05
* | | | | | | git-fast-import.txt: --relative-marks takes no parameterMichael J Gruber2011-05-05
* | | | | | | shell: add missing initialization of argv0_pathDima Sharov2011-05-05
* | | | | | | Git 1.7.5.1v1.7.5.1Junio C Hamano2011-05-04
* | | | | | | Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \
| * | | | | | | --dirstat: In case of renames, use target filename instead of source filenameJohan Herland2011-04-12
| * | | | | | | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-11
| * | | | | | | --dirstat-by-file: Make it faster and more correctJohan Herland2011-04-11
| * | | | | | | --dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland2011-04-11
* | | | | | | | Merge branch 'sp/maint-clear-postfields' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \
| * | | | | | | | http: clear POSTFIELDS when initializing a slotJunio C Hamano2011-04-26
* | | | | | | | | Merge branch 'jk/maint-stash-oob' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash: fix false positive in the invalid ref test.Jon Seymour2011-04-05
| * | | | | | | | | stash: fix accidental apply of non-existent stashesJeff King2011-04-05
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/maint-upload-pack-shallow' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | upload-pack: start pack-objects before async rev-listJeff King2011-04-06
* | | | | | | | | | Merge branch 'dm/stash-k-i-p' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: ensure --no-keep-index and --patch can be used in any orderDan McGee2011-04-07
| * | | | | | | | | | stash: add two more tests for --no-keep-indexDan McGee2011-04-07
* | | | | | | | | | | Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Teach core.bigfilethreashold to pack-objectsJunio C Hamano2011-04-05
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2011-05-04
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reflog: fix overriding of command line optionsMichael J Gruber2011-04-01
| * | | | | | | | | | | t/t1411: test reflog with formatsMichael J Gruber2011-04-01
| * | | | | | | | | | | builtin/log.c: separate default and setup of cmd_log_init()Michael J Gruber2011-04-01