summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2006-12-08git-svn: use do_switch for --follow-parent if the SVN library supports itLibravatar Eric Wong1-7/+39
2006-12-08Fix documentation copy&paste typoLibravatar Uwe Zeisberger1-1/+1
2006-12-08git-svn: extra error check to ensure we open a file correctlyLibravatar Eric Wong1-0/+3
2006-12-07Documentation: update git-clone man page with new behaviorLibravatar J. Bruce Fields1-13/+12
2006-12-06Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
2006-12-06cvsserver: Avoid miscounting bytes in Perl v5.8.xLibravatar Martin Langhoff1-0/+1
2006-12-06change the unpack limit treshold to a saner valueLibravatar Nicolas Pitre1-1/+1
2006-12-06Documentation: reorganize cvs-migration.txtLibravatar J. Bruce Fields1-245/+104
2006-12-06Explicitly add the default "git pull" behaviour to .git/config on cloneLibravatar Andy Parkins1-1/+3
2006-12-06git-merge: fix "fix confusion between tag and branch" for realLibravatar Junio C Hamano1-2/+3
2006-12-06git-svn: avoid network timeouts for long-running fetchesLibravatar Eric Wong1-0/+1
2006-12-06gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" viewLibravatar Jakub Narebski1-8/+22
2006-12-06git-merge: squelch needless error message.Libravatar Junio C Hamano1-1/+1
2006-12-06Merge Libravatar Junio C Hamano1-5/+5
2006-12-06Merge branch 'maint'Libravatar Junio C Hamano2-4/+7
2006-12-06git-reset to remove "$GIT_DIR/MERGE_MSG"Libravatar Junio C Hamano1-1/+2
2006-12-06merge-file: support -p and -q; fix compile warningsLibravatar Johannes Schindelin1-9/+16
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeLibravatar Johannes Schindelin5-0/+191
2006-12-06cvs-migration: improved section titles, better push/commit explanationLibravatar J. Bruce Fields1-7/+12
2006-12-06cvs-migration document: make the need for "push" more obviousLibravatar Johannes Schindelin1-0/+5
2006-12-05git-branch: let caller specify logmsgLibravatar Lars Hjemli3-10/+10
2006-12-05rename_ref: use lstat(2) when testing for symlinkLibravatar Lars Hjemli2-1/+8
2006-12-05git-branch: add options and tests for branch renamingLibravatar Lars Hjemli5-26/+250
2006-12-05read-tree: document --exclude-per-directoryLibravatar Junio C Hamano2-2/+16
2006-12-05Loosen "working file will be lost" check in Porcelain-ishLibravatar Junio C Hamano2-3/+4
2006-12-05read-tree: further loosen "working file will be lost" check.Libravatar Junio C Hamano6-15/+119
2006-12-05xdl_merge(): fix and simplify conflict handlingLibravatar Johannes Schindelin1-16/+5
2006-12-04make 'git add' a first class user friendly interface to the indexLibravatar Nicolas Pitre4-35/+72
2006-12-04Document git-diff whitespace flags -b and -wLibravatar Jakub Narebski1-0/+16
2006-12-04diff -b: ignore whitespace at end of lineLibravatar Johannes Schindelin2-5/+4
2006-12-04Merge branch 'maint'Libravatar Junio C Hamano3-5/+22
2006-12-04unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.Libravatar Junio C Hamano1-3/+5
2006-12-04receive-pack: do not insist on fast-forward outside refs/heads/Libravatar Junio C Hamano1-1/+2
2006-12-04git-fetch: ignore dereferenced tags in expand_refs_wildcardLibravatar Michael Loeffler1-1/+1
2006-12-04git-clone: Rename --use-immingled-remote option to --no-separate-remoteLibravatar Jakub Narebski2-5/+5
2006-12-04gitweb: Fix Atom feed <logo>: it is $logo, not $logo_urlLibravatar Jakub Narebski1-1/+1
2006-12-04Make perl/ build procedure ActiveState friendly.Libravatar Alex Riesen3-7/+57
2006-12-04Pass -M to diff in request-pullLibravatar David Miller1-1/+1
2006-12-04Set permissions of each new file before "cvs add"ing it.Libravatar Jim Meyering2-0/+29
2006-12-04git-mv: search more precisely for source directory in indexLibravatar Johannes Schindelin2-4/+20
2006-12-02xdl_merge(): fix thinkoLibravatar Johannes Schindelin1-2/+2
2006-12-02xdl_merge(): fix an off-by-one bugLibravatar Johannes Schindelin1-5/+5
2006-12-02merge-recursive: use xdl_merge().Libravatar Junio C Hamano1-57/+41
2006-12-02xmerge: make return value from xdl_merge() more usable.Libravatar Junio C Hamano1-10/+7
2006-12-02xdiff: add xdl_merge()Libravatar Johannes Schindelin5-3/+444
2006-12-02Merge branch 'maint'Libravatar Junio C Hamano1-5/+5
2006-12-02git-svn: avoid fetching files twice in the same revisionLibravatar Eric Wong1-5/+5
2006-12-02git-merge: fix confusion between tag and branchLibravatar Junio C Hamano1-5/+5
2006-12-01De-emphasise the symbolic link documentation.Libravatar Andy Parkins1-18/+11
2006-12-01git-diff: Introduce --index and deprecate --cached.Libravatar Andreas Ericsson2-3/+5