summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/add-addremove'Junio C Hamano2008-08-273-69/+93
|\
| * builtin-add.c: optimize -A option and "git add ."Junio C Hamano2008-07-251-12/+31
| * builtin-add.c: restructure the code for maintainabilityJunio C Hamano2008-07-253-57/+62
* | Merge branch 'np/verify-pack'Junio C Hamano2008-08-275-1/+22
|\ \
| * | discard revindex data when pack list changesNicolas Pitre2008-08-225-1/+22
* | | Merge branch 'da/submodule-sync'Junio C Hamano2008-08-272-2/+55
|\ \ \
| * | | git-submodule: add "sync" commandDavid Aguilar2008-08-252-2/+55
* | | | Merge branch 'maint'Junio C Hamano2008-08-273-1/+6
|\ \ \ \
| * | | | ctype.c: protect tiny C preprocessor constantsJunio C Hamano2008-08-271-0/+5
| * | | | index-pack: be careful after fixing up the header/footerLinus Torvalds2008-08-272-1/+1
* | | | | Make it possible to abort the submission of a change to PerforceSimon Hausmann2008-08-271-8/+23
* | | | | Merge branch 'af/maint-install-no-handlink'Junio C Hamano2008-08-261-11/+11
|\ \ \ \ \
| * | | | | Makefile: always provide a fallback when hardlinks failAndreas Färber2008-08-251-11/+11
* | | | | | Merge branch 'jc/no-slim-shell'Junio C Hamano2008-08-264-6/+3
|\ \ \ \ \ \
| * | | | | | Revert "Build-in "git-shell""Junio C Hamano2008-08-254-6/+3
* | | | | | | Merge branch 'maint'Junio C Hamano2008-08-269-35/+46
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | index-pack: setup git repositoryNguyễn Thái Ngọc Duy2008-08-261-0/+2
| * | | | | | Suppress some bash redirection error messagesRamsay Jones2008-08-263-10/+4
| * | | | | | Fix a warning (on cygwin) to allow -WerrorRamsay Jones2008-08-261-1/+2
| * | | | | | Fix "git log -i --grep"Jeff King2008-08-244-24/+38
| | |/ / / / | |/| | | |
* | | | | | format-patch: use default diff format even with patch optionsJeff King2008-08-262-1/+27
| |_|/ / / |/| | | |
* | | | | Install git-shell in bindir, tooTommi Virtanen2008-08-241-1/+1
* | | | | Merge branch 'jc/no-slim-shell'Junio C Hamano2008-08-244-19/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Build-in "git-shell"Junio C Hamano2008-08-204-3/+6
| * | | | shell: do not play duplicated definition games to shrink the executableJunio C Hamano2008-08-192-16/+1
* | | | | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-2411-52/+126
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | GIT 1.6.0.1v1.6.0.1Junio C Hamano2008-08-241-6/+11
| * | | | Merge branch 'ag/maint-combine-diff-fix' into maintJunio C Hamano2008-08-242-0/+28
| |\ \ \ \
| | * | | | Respect core.autocrlf in combined diffAlexander Gavrilov2008-08-232-0/+28
| * | | | | Merge branch 'mv/maint-merge-fix' into maintJunio C Hamano2008-08-244-8/+32
| |\ \ \ \ \
| | * | | | | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-234-8/+32
| | |/ / / /
| * | | | | Documentation: clarify pager configurationJonathan Nieder2008-08-242-3/+9
| * | | | | Documentation: clarify pager.<cmd> configurationJonathan Nieder2008-08-241-3/+5
| * | | | | Clean up the git-p4 documentationSimon Hausmann2008-08-241-31/+38
| * | | | | Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UXMiklos Vajna2008-08-231-0/+1
| |/ / / /
* | | | | git-submodule - Use "get_default_remote" from git-parse-remoteMark Levedahl2008-08-241-3/+2
* | | | | Merge branch 'maint'Junio C Hamano2008-08-236-5/+10
|\ \ \ \ \ | |/ / / /
| * | | | unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano2008-08-233-2/+6
| * | | | git-p4: Fix one-liner in p4_write_pipe function.Tor Arvid Lund2008-08-221-1/+1
| * | | | Completion: add missing '=' for 'diff --diff-filter'Eric Raible2008-08-221-1/+1
| * | | | Fix 'git help help'Miklos Vajna2008-08-211-1/+2
| | |/ / | |/| |
* | | | git-submodule: replace duplicated code with a module_list functionDavid Aguilar2008-08-221-4/+13
* | | | git-merge documentation: more details about resolving conflictsDan Hensgen2008-08-221-6/+18
* | | | Extend "checkout --track" DWIM to support more casesAlex Riesen2008-08-224-17/+46
* | | | Revert "Convert output messages in merge-recursive to past tense."Jonathan del Strother2008-08-221-18/+18
* | | | templates/Makefile: install is unnecessary, just use mkdir -pJunio C Hamano2008-08-221-2/+2
* | | | remote.c: add a function for deleting a refspec array and use it (twice)Brandon Casey2008-08-222-2/+28
* | | | filter-branch: Grok special characters in tag namesJohannes Sixt2008-08-212-5/+15
* | | | test-lib: do not remove trash_directory if called with --debugJohannes Schindelin2008-08-211-1/+1
* | | | provide more errors for the "merge into empty head" casePaolo Bonzini2008-08-211-0/+5