summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ignore dirty submodule states during rebase and stashJohannes Schindelin2008-05-154-12/+105
* Teach update-index about --ignore-submodulesJohannes Schindelin2008-05-154-0/+14
* diff options: Introduce --ignore-submodulesJohannes Schindelin2008-05-153-0/+13
* Merge branch 'maint'Junio C Hamano2008-05-141-3/+4
|\
| * Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-05-141-3/+4
| |\
| | * Documentation/git-describe.txt: make description more readableIan Hilt2008-05-141-3/+4
* | | Merge branch 'sb/committer'Junio C Hamano2008-05-146-40/+109
|\ \ \
| * | | commit: Show committer if automaticSanti Béjar2008-05-066-3/+40
| * | | commit: Show author if different from committerSanti Béjar2008-05-062-3/+35
| * | | Preparation to call determine_author_info from prepare_to_commitSanti Béjar2008-05-061-39/+39
* | | | Merge branch 'bd/tests'Junio C Hamano2008-05-1457-539/+591
|\ \ \ \
| * | | | Rename the test trash directory to contain spaces.Bryan Donlan2008-05-053-6/+6
| * | | | Fix tests breaking when checkout path contains shell metacharactersBryan Donlan2008-05-0539-469/+475
| * | | | Don't use the 'export NAME=value' in the test scripts.Bryan Donlan2008-05-0510-39/+52
| * | | | lib-git-svn.sh: Fix quoting issues with paths containing shell metacharactersBryan Donlan2008-05-051-1/+2
| * | | | test-lib.sh: Fix some missing path quotingBryan Donlan2008-05-051-1/+1
| * | | | Use test_set_editor in t9001-send-email.shBryan Donlan2008-05-051-4/+1
| * | | | test-lib.sh: Add a test_set_editor function to safely set $VISUALBryan Donlan2008-05-051-0/+16
| * | | | git-send-email.perl: Handle shell metacharacters in $EDITOR properlyBryan Donlan2008-05-052-3/+7
| * | | | config.c: Escape backslashes in section names properlyBryan Donlan2008-05-052-1/+7
| * | | | git-rebase.sh: Fix --merge --abort failures when path contains whitespaceBryan Donlan2008-05-052-13/+22
* | | | | Merge branch 'mv/format-cc'Junio C Hamano2008-05-144-0/+75
|\ \ \ \ \
| * | | | | Add tests for sendemail.cc configuration variableMiklos Vajna2008-04-291-0/+66
| * | | | | git-send-email: add a new sendemail.cc configuration variableMiklos Vajna2008-04-291-0/+1
| * | | | | git-format-patch: add a new format.cc configuration variableMiklos Vajna2008-04-292-0/+8
* | | | | | Merge branch 'cc/hooks-doc'Junio C Hamano2008-05-149-13/+28
|\ \ \ \ \ \
| * | | | | | Documentation: rename "hooks.txt" to "githooks.txt" and make it a man pageChristian Couder2008-05-049-13/+28
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/renamelimit' (early part)Junio C Hamano2008-05-147-6/+94
|\ \ \ \ \ \
| * | | | | | diff: make "too many files" rename warning optionalJeff King2008-05-033-1/+4
| * | | | | | bump rename limit defaultsJeff King2008-05-033-3/+3
| * | | | | | add merge.renamelimit config optionJeff King2008-05-033-3/+88
| * | | | | | Merge commit 'sg/merge-options^' into jk/renamelimitJunio C Hamano2008-05-0311-81/+186
| |\ \ \ \ \ \
* | | | | | | | filter-branch: fix variable export logicJeff King2008-05-131-3/+9
* | | | | | | | clone: bsd shell portability fixJeff King2008-05-131-2/+1
* | | | | | | | t5000: tar portability fixJeff King2008-05-131-4/+4
* | | | | | | | fix bsd shell negationJeff King2008-05-135-8/+8
* | | | | | | | 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
View Lorry Controller Status