aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano2011-05-26
|\
| * revert: allow reverting a root commitJeff King2011-05-16
| * cherry-pick: handle root commits with external strategiesJeff King2011-05-16
* | Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-26
* | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maintJunio C Hamano2011-05-26
* | init/clone: remove short option -L and document --separate-git-dirNguyen Thai Ngoc Duy2011-05-25
* | Merge branch 'vr/merge-base-doc' into maintJunio C Hamano2011-05-16
|\ \
| * | Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-15
| * | Merge branch 'jc/index-update-if-able' into maintJunio C Hamano2011-04-03
| |\ \
| * \ \ Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-03
| |\ \ \
| * \ \ \ Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano2011-04-03
| |\ \ \ \
| * \ \ \ \ Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-03
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/maint-apply-report-offset' into maintJunio C Hamano2011-04-01
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-apply-no-double-patch' into maintJunio C Hamano2011-04-01
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "checkout ambiguous ref bugfix" into maintJunio C Hamano2011-04-01
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-23
* | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-16
* | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | "add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2011-04-29
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2011-05-15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: don't pass on the --quiet flagCarlos Martín Nieto2011-04-12
* | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-14
* | | | | | | | | | | Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-29
* | | | | | | | | | | | 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
| * | | | | | | | | | | | builtin/log.c: separate default and setup of cmd_log_init()Michael J Gruber2011-04-01
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | revert: Hide '-r' option in default usageRamkumar Ramachandra2011-04-13
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-04-06
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remote: deprecate --mirrorJeff King2011-03-30
| * | | | | | | | | | | remote: separate the concept of push and fetch mirrorsJeff King2011-03-30
| * | | | | | | | | | | remote: disallow some nonsensical option combinationsJeff King2011-03-30
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-04
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch/pull: Add the 'on-demand' value to the --recurse-submodules optionJens Lehmann2011-03-09
| * | | | | | | | | | | fetch/pull: recurse into submodules when necessaryJens Lehmann2011-03-09
* | | | | | | | | | | | sparse: Fix errors and silence warningsStephen Boyd2011-04-03
* | | | | | | | | | | | Merge branch 'nd/init-gitdir'Junio C Hamano2011-04-01
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | init, clone: support --separate-git-dir for .git fileNguyễn Thái Ngọc Duy2011-03-19
* | | | | | | | | | | | | Merge branch 'jc/merge-sans-branch'Junio C Hamano2011-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: merge with the default upstream branch without argumentJunio C Hamano2011-03-24
| * | | | | | | | | | | | | merge: match the help text with the documentationJared Hance2011-03-24
* | | | | | | | | | | | | | Merge branch 'jr/grep-en-config'Junio C Hamano2011-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: allow -E and -n to be turned on by default via configurationJoe Ratterman2011-03-30
* | | | | | | | | | | | | | | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | i18n: git-shortlog basic messagesÆvar Arnfjörð Bjarmason2011-03-09
| * | | | | | | | | | | | | | | i18n: git-revert split up "could not revert/apply" messageÆvar Arnfjörð Bjarmason2011-03-09
| * | | | | | | | | | | | | | | i18n: git-revert literal "me" messagesÆvar Arnfjörð Bjarmason2011-03-09