summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2008-05-25Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano75-176/+179
2008-05-25Merge branch 'as/graph'Junio C Hamano6-62/+191
2008-05-25Merge branch 'js/mailinfo'Junio C Hamano7-35/+115
2008-05-25Merge branch 'jc/add-n-u'Junio C Hamano5-36/+53
2008-05-25Merge branch 'ar/t6031'Junio C Hamano1-2/+5
2008-05-25Merge branch 'db/clone-in-c'Junio C Hamano19-119/+816
2008-05-25Merge branch 'jc/apply-whitespace'Junio C Hamano2-72/+139
2008-05-25Merge branch 'jc/unpack-trees-reword'Junio C Hamano3-14/+52
2008-05-25Merge branch 'ar/batch-cat'Junio C Hamano9-82/+781
2008-05-25Merge branch 'cc/bisect'Junio C Hamano2-61/+116
2008-05-25Merge branch 'ap/svn'Junio C Hamano3-1/+93
2008-05-25Merge branch 'js/cvsexportcommit'Junio C Hamano3-7/+55
2008-05-25Merge branch 'js/ignore-submodule'Junio C Hamano11-12/+132
2008-05-25Merge branch 'mo/cvsserver'Junio C Hamano4-69/+826
2008-05-25mailsplit: minor clean-up in read_line_with_nul()Junio C Hamano1-4/+3
2008-05-25mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepathsJunio C Hamano4-21/+71
2008-05-25mailsplit and mailinfo: gracefully handle NUL charactersJohannes Schindelin5-15/+46
2008-05-25http-push: remove remote locks on exit signalsClemens Buchacher1-0/+22
2008-05-25Reset the signal being handledClemens Buchacher1-1/+1
2008-05-25Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them.Paul Oliver1-0/+1
2008-05-25get_revision(): honor the topo_order flag for boundary commitsAdam Simpkins2-24/+58
2008-05-25Fix output of "git log --graph --boundary"Adam Simpkins2-14/+67
2008-05-25log --graph --left-right: show left/right information in place of '*'Adam Simpkins6-41/+49
2008-05-25graph API: don't print branch lines for uninteresting merge parentsAdam Simpkins1-13/+44
2008-05-25graph API: fix graph mis-alignment after uninteresting commitsAdam Simpkins1-0/+3
2008-05-24Documentation: convert tutorials to man pagesChristian Couder7-24/+87
2008-05-24CodingGuidelines: Add a note to avoid assignments inside if()Miklos Vajna1-0/+2
2008-05-24Remove redundant code, eliminate one static variableHeikki Orsila1-27/+17
2008-05-23Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2-23/+29
2008-05-23Merge branch 'pb/push'Junio C Hamano6-35/+116
2008-05-23Merge branch 'bc/repack'Junio C Hamano7-34/+154
2008-05-23Merge branch 'sp/ignorecase'Junio C Hamano2-1/+36
2008-05-23Merge branch 'maint'Junio C Hamano4-11/+18
2008-05-23Add log.date config variableHeikki Orsila3-1/+18
2008-05-23Merge branch 'maint-1.5.4' into maintv1.5.5.2Junio C Hamano1-6/+12
2008-05-23rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a refJohannes Sixt1-6/+12
2008-05-23Make git add -n and git -u -n output consistentGustaf Hendeby1-15/+5
2008-05-23change quoting in test t1006-cat-file.shMichele Ballabio1-3/+3
2008-05-23builtin-cat-file.c: use parse_options()Michele Ballabio1-73/+46
2008-05-23git-svn: Speed up fetchAdam Roben1-22/+20
2008-05-23Git.pm: Add hash_and_insert_object and cat_blobAdam Roben1-2/+150
2008-05-23Git.pm: Add command_bidi_pipe and command_close_bidi_pipeAdam Roben1-0/+56
2008-05-23git-hash-object: Add --stdin-paths optionAdam Roben3-2/+80
2008-05-23Add more tests for git hash-objectAdam Roben1-27/+93
2008-05-23Move git-hash-object tests from t5303 to t1007Adam Roben1-0/+0
2008-05-22Updated status to show 'Not currently on any branch' in redChris Parsons3-5/+13
2008-05-22Add test for cloning with "--reference" repo being a subset of source repoJohan Herland1-0/+5
2008-05-22Add a test for another combination of --referenceJohan Herland1-0/+21
2008-05-22Test that --reference actually suppresses fetching referenced objectsDaniel Barkalow1-1/+8
2008-05-22Add missing "short" alternative to --date in rev-list-options.txtHeikki Orsila1-1/+1
2008-05-22git-show.txt: Not very stubby these days.Jon Loeliger1-2/+0
2008-05-22Clarify repack -n documentationShawn O. Pearce1-2/+5
2008-05-22pull --rebase: exit early when the working directory is dirtyJohannes Schindelin2-0/+23
2008-05-22gitweb: Convert string to internal form before chopping in chop_strAnders Waldenborg1-0/+4
2008-05-22bisect: use a detached HEAD to bisectChristian Couder2-47/+45
2008-05-22bisect: trap critical errors in "bisect_start"Christian Couder2-12/+28
2008-05-22bisect: fix left over "BISECT_START" file when starting with junk revChristian Couder2-10/+8
2008-05-22bisect: add test cases to check that "git bisect start" is atomicChristian Couder1-0/+43
2008-05-22gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"Paul Mackerras1-1/+3
2008-05-21Documentation: Fix skipped section levelGustaf Hendeby1-1/+1
2008-05-21Merge branch 'maint'Junio C Hamano2-3/+3
2008-05-21Merge branch 'maint-1.5.4' into maintJunio C Hamano2-3/+3
2008-05-21Merge branch 'ar/add-unreadable'Junio C Hamano8-21/+114
2008-05-21Merge branch 'ds/branch-auto-rebase'Junio C Hamano0-0/+0
2008-05-21Merge branch 'sv/first-parent'Junio C Hamano1-8/+6
2008-05-21Merge branch 'np/pack'Junio C Hamano1-79/+120
2008-05-21Merge branch 'as/graph'Junio C Hamano9-18/+1409
2008-05-21Merge branch 'jk/maint-send-email-compose'Junio C Hamano2-2/+100
2008-05-21Merge branch 'hb/maint-send-email-quote-recipients'Junio C Hamano1-1/+1
2008-05-21cvsexportcommit: Create config option for CVS dirTrent Piepho2-1/+12
2008-05-21Fix recipient santitizationHorst H. von Brand1-1/+1
2008-05-21send-email: rfc2047-quote subject lines with non-ascii charactersJeff King2-2/+32
2008-05-21send-email: specify content-type of --compose bodyJeff King2-0/+68
2008-05-21Documentation: rev-parse: add a few "--verify" and "--default" examplesChristian Couder1-0/+25
2008-05-21git-merge: exclude unnecessary options from OPTIONS_SPECMiklos Vajna1-3/+1
2008-05-21"git-add -n -u" should not add but just reportJunio C Hamano7-23/+57
2008-05-21Fix t3701 if core.filemode disabledAlex Riesen1-0/+7
2008-05-21clone: fall back to copying if hardlinking failsDaniel Barkalow1-5/+7
2008-05-21Fix t6031 on filesystems without working exec bitAlex Riesen1-2/+5
2008-05-21Fix prepare-commit-msg hook and replace in-place sedMarcel Koeppen1-4/+4
2008-05-20gitk: Fix bug where current row number display stops workingPaul Mackerras1-23/+23
2008-05-19git-am: fix typo in usage messageJeff King1-1/+1
2008-05-19doc/git-daemon: s/uploadarchive/uploadarch/Jeff King1-2/+2
2008-05-19Documentation: Add missing git svn commandsGustaf Hendeby1-2/+15
2008-05-19unpack-trees: allow Porcelain to give different error messagesJunio C Hamano3-14/+52
2008-05-18t/Makefile: "trash" directory was renamed recentlyBrandon Casey3-3/+3
2008-05-18Ensure that a test is run in the trash directoryAlex Riesen1-1/+1
2008-05-18builtin-clone.c: Need to closedir() in copy_or_link_directory()Brandon Casey1-0/+1
2008-05-19gitk: Move es.po where it belongsMichele Ballabio1-0/+0
2008-05-19gitk: Fix "wrong # coordinates" error on reloadPaul Mackerras1-0/+4
2008-05-17builtin-apply: do not declare patch is creation when we do not know itJunio C Hamano2-15/+61
2008-05-17t0050: Fix merge test on case sensitive file systemsSteffen Prohaska1-0/+2
2008-05-17Makefile: update the default build options for AIXMike Ralphson1-0/+4
2008-05-17builtin-apply: accept patch to an empty fileJunio C Hamano1-56/+77
2008-05-17builtin-apply: typofixJunio C Hamano1-1/+1
2008-05-16Merge branch 'maint'Junio C Hamano1-0/+4
2008-05-16Replace in-place sed in t7502-commitMarcel Koeppen1-1/+3
2008-05-16git-filter-branch: Clarify file removal example.Jon Loeliger1-0/+4
2008-05-16submodule update: add convenience option --initJohannes Schindelin3-2/+25
2008-05-16Documentation/git-repack.txt: document new -A behaviourChris Frey1-1/+13
2008-05-16git-fast-import: rename cmd_*() functions to parse_*()Miklos Vajna1-31/+31
2008-05-16Documentation/git-web--browse.txt: fix small typoTeemu Likonen1-1/+1
2008-05-16Use '-f' option to point to the .gitmodules fileImran M Yousuf1-5/+4
2008-05-16git-cvsserver: add ability to guess -kb from contentsMatthew Ogilvie4-25/+354
2008-05-16implement gitcvs.usecrlfattrMatthew Ogilvie4-22/+276
2008-05-16git-cvsserver: add mechanism for managing working tree and current directoryMatthew Ogilvie1-39/+213
2008-05-15cvsexportcommit: introduce -W for shared working trees (between Git and CVS)Johannes Schindelin3-6/+53
2008-05-15Ignore dirty submodule states during rebase and stashJohannes Schindelin4-12/+105
2008-05-15Teach update-index about --ignore-submodulesJohannes Schindelin4-0/+14
2008-05-15diff options: Introduce --ignore-submodulesJohannes Schindelin3-0/+13
2008-05-15cvsexportcommit: chomp only removes trailing whitespaceJohannes Schindelin1-1/+2
2008-05-15builtin-clone: fix initial checkoutJohannes Schindelin2-0/+10
2008-05-15Merge git://repo.or.cz/git-guiJunio C Hamano7-25/+49
2008-05-15Documentation/git-prune.txt: document unpacked logicChris Frey1-1/+4
2008-05-14Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano5-888/+4028
2008-05-14Merge branch 'maint'Junio C Hamano1-3/+4
2008-05-14Merge branch 'maint-1.5.4' into maintJunio C Hamano1-3/+4
2008-05-14Merge branch 'sb/committer'Junio C Hamano6-40/+109
2008-05-14Merge branch 'bd/tests'Junio C Hamano57-539/+591
2008-05-14Merge branch 'mv/format-cc'Junio C Hamano4-0/+75
2008-05-14Merge branch 'cc/hooks-doc'Junio C Hamano9-13/+28
2008-05-14Merge branch 'jk/renamelimit' (early part)Junio C Hamano7-6/+94
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin74-173/+176
2008-05-14Documentation/git-describe.txt: make description more readableIan Hilt1-3/+4
2008-05-13let pack-objects do the writing of unreachable objects as loose objectsNicolas Pitre2-17/+45
2008-05-13add a force_object_loose() functionNicolas Pitre2-13/+48
2008-05-13filter-branch: fix variable export logicJeff King1-3/+9
2008-05-13clone: bsd shell portability fixJeff King1-2/+1
2008-05-13t5000: tar portability fixJeff King1-4/+4
2008-05-13fix bsd shell negationJeff King5-8/+8
2008-05-12Add a config option to ignore errors for git-addAlex Riesen2-1/+31
2008-05-12Add a test for git-add --ignore-errorsAlex Riesen1-0/+22
2008-05-12Add --ignore-errors to git-add to allow it to skip files with read errorsAlex Riesen2-3/+15
2008-05-12Extend interface of add_files_to_cache to allow ignore indexing errorsAlex Riesen4-12/+37
2008-05-12Make the exit code of add_file_to_index actually usefulAlex Riesen4-9/+13
2008-05-12Improve reporting of errors in config file routinesAlex Riesen1-19/+16
2008-05-12Allow tracking branches to set up rebase by default.Dustin Sallings6-1/+294
2008-05-12git-svn: add test for --add-author-from and --use-log-authorJunio C Hamano1-0/+70
2008-05-12revision.c: really honor --first-parentLars Hjemli1-4/+4
2008-05-12Merge branch 'gp/bisect-fix'Junio C Hamano3-10/+55
2008-05-12gitk: Add a progress bar for checking out a headPaul Mackerras1-10/+31
2008-05-11Merge branch 'maint'Junio C Hamano3-3/+4
2008-05-11Merge branch 'maint-1.5.4' into maintJunio C Hamano3-3/+4
2008-05-11Merge branch 'lt/core-optim'Junio C Hamano16-169/+393
2008-05-11rev-parse --verify: do not output anything on errorChristian Couder2-24/+26
2008-05-11rev-parse: fix using "--default" with "--verify"Christian Couder2-6/+7
2008-05-11rev-parse: add test script for "--verify"Christian Couder1-0/+114
2008-05-11t0050: Add test for case insensitive addSteffen Prohaska1-0/+10
2008-05-11t0050: Set core.ignorecase case to activate case insensitivitySteffen Prohaska1-0/+1
2008-05-11t0050: Test autodetect core.ignorecaseSteffen Prohaska1-0/+16
2008-05-11git-init: autodetect core.ignorecaseDmitry Potapov1-1/+7
2008-05-11builtin-gc.c: deprecate --prune, it now really has no effectBrandon Casey1-2/+1
2008-05-11git-gc: always use -A when manually repackingBrandon Casey1-11/+2
2008-05-11repack: modify behavior of -A option to leave unreferenced objects unpackedBrandon Casey2-5/+60
2008-05-11Add svn-compatible "blame" output format to git-svnSteven Grimm2-15/+55
2008-05-11mergetool: Make ECMerge use the settings as specified by the user in the GUISebastian Schuberth1-2/+2
2008-05-11git-format-patch: add --no-binary to omit binary changes in the patch.Caio Marcelo de Oliveira Filho2-1/+10
2008-05-11wt-status.h: declare global variables as externJohannes Sixt1-2/+2
2008-05-11builtin-commit.c: add -u as short name for --untracked-filesSitaram Chamarty1-1/+1
2008-05-11git-repack: re-enable parsing of -n command line optionA Large Angry SCM1-0/+1
2008-05-11Allow tracking branches to set up rebase by default.Dustin Sallings6-1/+294
2008-05-11git-svn: fix cloning of HTTP URLs with '+' in their pathEric Wong3-4/+42
2008-05-11alloc_ref_from_str(): factor out a common pattern of alloc_ref from stringKrzysztof Kowalczyk6-27/+19
2008-05-11gitk: Show current row number and total number of rowsPaul Mackerras1-39/+28
2008-05-10Optimize symlink/directory detectionLinus Torvalds5-47/+61
2008-05-10Avoid some unnecessary lstat() callsLinus Torvalds3-14/+23
2008-05-10Merge branch 'py/diff-submodule'Junio C Hamano4-8/+73
2008-05-10Merge branch 'lt/case-insensitive'Junio C Hamano10-105/+241
2008-05-11Merge branch 'master' into devPaul Mackerras6-197/+3203
2008-05-11gitk: Allow users to view diffs in external diff viewerThomas Arcila1-2/+145
2008-05-10gitk: Synchronize highlighting in file view for 'f' and 'b' commandsPaul Mackerras1-7/+25
2008-05-08Merge branch 'maint'Junio C Hamano2-2/+5
2008-05-08Merge branch 'maint-1.5.4' into maintJunio C Hamano2-2/+5
2008-05-08Merge branch 'sg/merge-options' (early part)Junio C Hamano11-81/+186
2008-05-08Merge branch 'db/learn-HEAD'Junio C Hamano10-29/+79
2008-05-08Merge branch 'jn/webfeed'Junio C Hamano2-25/+104
2008-05-08Merge branch 'cc/help'Junio C Hamano4-28/+233
2008-05-08Merge branch 'dm/cherry-pick-s'Junio C Hamano3-7/+23
2008-05-08Merge branch 'lt/dirmatch-optim'Junio C Hamano1-2/+20
2008-05-08bisect: print an error message when "git rev-list --bisect-vars" failsChristian Couder2-2/+24
2008-05-08compat-util: avoid macro redefinition warningJohannes Sixt1-0/+3
2008-05-08compat/fopen.c: avoid clobbering the system defined fopen macroBrandon Casey1-1/+12
2008-05-08git-gui: Delete branches with 'git branch -D' to clear configShawn O. Pearce1-1/+1
2008-05-08git-gui: Setup branch.remote,merge for shorthand git-pullShawn O. Pearce3-1/+27
2008-05-09gitk: Make updates go fasterPaul Mackerras1-15/+210
2008-05-08Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"Dustin Sallings1-1/+2
2008-05-08doc: clarify definition of "update" for git-add -uJeff King1-1/+3
2008-05-08Documentation: bisect: add a few "git bisect run" examplesChristian Couder1-0/+49
2008-05-08Documentation/config.txt: Add git-gui optionsGustaf Hendeby1-0/+30
2008-05-06Documentation: improve "add", "pull" and "format-patch" examplesChristian Couder3-69/+108
2008-05-06Be more careful with objects directory permissions on cloneMark Hills1-1/+4
2008-05-06commit: Show committer if automaticSanti Béjar6-3/+40
2008-05-06commit: Show author if different from committerSanti Béjar2-3/+35
2008-05-06Preparation to call determine_author_info from prepare_to_commitSanti Béjar1-39/+39
2008-05-05git-cat-file: Add --batch optionAdam Roben3-38/+117
2008-05-05git-cat-file: Add --batch-check optionAdam Roben3-7/+163
2008-05-05git-cat-file: Make option parsing a little more flexibleAdam Roben1-12/+30
2008-05-05git-cat-file: Small refactor of cmd_cat_fileAdam Roben1-16/+22
2008-05-05Add tests for git cat-fileAdam Roben1-0/+121
2008-05-05Merge branch 'jc/lstat'Junio C Hamano2-3/+6