summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve reporting of errors in config file routinesAlex Riesen2008-05-121-19/+16
* Merge branch 'gp/bisect-fix'Junio C Hamano2008-05-123-10/+55
|\
| * bisect: print an error message when "git rev-list --bisect-vars" failsChristian Couder2008-05-082-2/+24
| * git-bisect.sh: don't accidentally override existing branch "bisect"Gerrit Pape2008-05-053-8/+31
* | Merge branch 'maint'Junio C Hamano2008-05-113-3/+4
|\ \
| * \ Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-05-113-3/+4
| |\ \
| | * | wt-status.h: declare global variables as externJohannes Sixt2008-05-111-2/+2
| | * | builtin-commit.c: add -u as short name for --untracked-filesSitaram Chamarty2008-05-111-1/+1
| | * | git-repack: re-enable parsing of -n command line optionA Large Angry SCM2008-05-111-0/+1
* | | | Merge branch 'lt/core-optim'Junio C Hamano2008-05-1116-169/+393
|\ \ \ \
| * | | | Optimize symlink/directory detectionLinus Torvalds2008-05-105-47/+61
| * | | | Avoid some unnecessary lstat() callsLinus Torvalds2008-05-103-14/+23
| * | | | Merge branch 'py/diff-submodule'Junio C Hamano2008-05-104-8/+73
| |\ \ \ \
| | * | | | is_racy_timestamp(): do not check timestamp for gitlinksJunio C Hamano2008-05-042-2/+3
| | * | | | diff-lib.c: rename check_work_tree_entity()Junio C Hamano2008-05-041-4/+4
| | * | | | diff: a submodule not checked out is not modifiedJunio C Hamano2008-05-042-4/+23
| | * | | | Add t7506 to test submodule related functions for git-statusPing Yin2008-05-042-1/+39
| | * | | | t4027: test diff for submodule with empty directoryPing Yin2008-05-041-0/+7
| * | | | | Merge branch 'lt/case-insensitive'Junio C Hamano2008-05-1010-105/+241
| |\ \ \ \ \
| | * | | | | Make git-add behave more sensibly in a case-insensitive environmentLinus Torvalds2008-04-092-1/+37
| | * | | | | When adding files to the index, add support for case-independent matchesLinus Torvalds2008-04-091-7/+5
| | * | | | | Make unpack-tree update removed files before any updated filesLinus Torvalds2008-04-091-2/+7
| | * | | | | Make branch merging aware of underlying case-insensitive filsystemsLinus Torvalds2008-04-092-1/+27
| | * | | | | Add 'core.ignorecase' optionLinus Torvalds2008-04-094-1/+8
| | * | | | | Make hash_name_lookup able to do case-independent lookupsLinus Torvalds2008-04-094-6/+52
| | * | | | | Make "index_name_exists()" return the cache_entry it foundLinus Torvalds2008-04-093-8/+8
| | * | | | | Move name hashing functions into a file of its ownLinus Torvalds2008-04-095-77/+95
| | * | | | | Make unpack_trees_options bit flags actual bitfieldsLinus Torvalds2008-04-091-10/+10
* | | | | | | rev-parse --verify: do not output anything on errorChristian Couder2008-05-112-24/+26
* | | | | | | rev-parse: fix using "--default" with "--verify"Christian Couder2008-05-112-6/+7
* | | | | | | rev-parse: add test script for "--verify"Christian Couder2008-05-111-0/+114
* | | | | | | Add svn-compatible "blame" output format to git-svnSteven Grimm2008-05-112-15/+55
* | | | | | | mergetool: Make ECMerge use the settings as specified by the user in the GUISebastian Schuberth2008-05-111-2/+2
* | | | | | | git-format-patch: add --no-binary to omit binary changes in the patch.Caio Marcelo de Oliveira Filho2008-05-112-1/+10
* | | | | | | Allow tracking branches to set up rebase by default.Dustin Sallings2008-05-116-1/+294
* | | | | | | git-svn: fix cloning of HTTP URLs with '+' in their pathEric Wong2008-05-113-4/+42
* | | | | | | alloc_ref_from_str(): factor out a common pattern of alloc_ref from stringKrzysztof Kowalczyk2008-05-116-27/+19
|/ / / / / /
* | | | | | Merge branch 'maint'Junio C Hamano2008-05-082-2/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-05-082-2/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"Dustin Sallings2008-05-081-1/+2
| | * | | doc: clarify definition of "update" for git-add -uJeff King2008-05-081-1/+3
* | | | | Merge branch 'sg/merge-options' (early part)Junio C Hamano2008-05-0811-81/+186
|\ \ \ \ \
| * | | | | merge, pull: add '--(no-)log' command line optionSZEDER Gábor2008-04-125-7/+36
| * | | | | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-124-13/+75
| * | | | | add 'merge.stat' config variableSZEDER Gábor2008-04-123-1/+6
| * | | | | merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-126-21/+40
| * | | | | doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor2008-04-123-43/+33
* | | | | | Merge branch 'db/learn-HEAD'Junio C Hamano2008-05-0810-29/+79
|\ \ \ \ \ \
| * | | | | | Make ls-remote http://... list HEAD, like for git://...Daniel Barkalow2008-04-265-2/+43
| * | | | | | Make walker.fetch_ref() take a struct ref.Daniel Barkalow2008-04-266-27/+36