summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 'jc/lstat'Junio C Hamano2008-05-052-3/+6
|\
| * diff-files: mark an index entry we know is up-to-date as suchJunio C Hamano2008-04-121-2/+5
| * write_index(): optimize ce_smudge_racily_clean_entry() calls with CE_UPTODATEJunio C Hamano2008-04-121-1/+1
* | Merge branch 'bc/filter-branch'Junio C Hamano2008-05-053-6/+58
|\ \
| * | filter-branch.sh: support nearly proper tag name filteringBrandon Casey2008-03-313-6/+58
* | | Merge branch 'lh/git-file'Junio C Hamano2008-05-058-7/+174
|\ \ \
| * | | Teach GIT-VERSION-GEN about the .git fileLars Hjemli2008-04-091-1/+1
| * | | Teach git-submodule.sh about the .git fileLars Hjemli2008-04-091-2/+2
| * | | Teach resolve_gitlink_ref() about the .git fileLars Hjemli2008-04-091-3/+14
| * | | Add platform-independent .git "symlink"Lars Hjemli2008-04-095-1/+157
* | | | Merge branch 'jk/fetch-status'Junio C Hamano2008-05-051-3/+1
|\ \ \ \
| * | | | git-fetch: always show status of non-tracking-ref fetchesJeff King2008-04-101-3/+1
* | | | | Merge branch 'lh/branch-merged'Junio C Hamano2008-05-053-3/+80
|\ \ \ \ \
| * | | | | Add tests for `branch --[no-]merged`Lars Hjemli2008-04-201-1/+41
| * | | | | git-branch.txt: compare --contains, --merged and --no-mergedLars Hjemli2008-04-201-0/+21
| * | | | | git-branch: add support for --merged and --no-mergedLars Hjemli2008-04-202-2/+18
* | | | | | Merge branch 'pb/remote-mirror-config'Junio C Hamano2008-05-058-36/+104
|\ \ \ \ \ \
| * | | | | | Add a remote.*.mirror configuration optionPaolo Bonzini2008-04-208-36/+104
| |/ / / / /
* | | | | | post-merge: Add it's not executed if merge failed.Jörg Sommer2008-05-051-1/+2
* | | | | | Documentation: Add create-ignore to git svn manualGustaf Hendeby2008-05-051-0/+6
* | | | | | git-svn: Make create-ignore use git add -fGustaf Hendeby2008-05-051-1/+1
* | | | | | INSTALL: add a note about GNU interactive tools has been renamedMiklos Vajna2008-05-051-0/+4
* | | | | | Cleanup xread() loops to use read_in_full()Heikki Orsila2008-05-034-35/+19
* | | | | | Merge branch 'maint'Junio C Hamano2008-05-032-3/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-05-031-2/+2
| |\ \ \ \ \ \
| | * | | | | | filter-branch: Documentation fix.Florian Ragwitz2008-05-031-2/+2
| * | | | | | | checkout: don't rfc2047-encode oneline on detached HEADJeff King2008-05-031-1/+1
* | | | | | | | Documentation: hooks: fix missing verb in pre-applypatch descriptionChristian Couder2008-05-031-4/+5
* | | | | | | | log: print log entry terminator even if the message is emptyAdam Simpkins2008-05-031-4/+3
* | | | | | | | Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins2008-05-036-25/+13
* | | | | | | | git-svn: Same default as cvsimport when using --use-log-authorStephen R. van den Berg2008-04-301-2/+4
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-04-301-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | fetch-pack: brown paper bag fixJunio C Hamano2008-04-301-1/+1
* | | | | | | | Documentation: point git-prune users to git-gcJeff King2008-04-292-1/+22
* | | | | | | | Documentation on --git-dir and --work-treeLiu Yubao2008-04-292-3/+15
* | | | | | | | Make read_in_full() and write_in_full() consistent with xread() and xwrite()Heikki Orsila2008-04-294-6/+8
* | | | | | | | Documentation gitk: Describe what --merge doesRichard Quirk2008-04-291-0/+6
* | | | | | | | Use the modern syntax of git-diff-files in t2002-checkout-cache-u.shAlex Riesen2008-04-291-2/+2
* | | | | | | | Add otherwise missing --strict option to unpack-objects summary.Jon Loeliger2008-04-291-1/+1
* | | | | | | | git-svn: detect and fail gracefully when dcommitting to a voidMatthieu Moy2008-04-292-2/+7
* | | | | | | | make git-status use a pagerBart Trojanowski2008-04-291-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-04-295-11/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-292-3/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | cvsimport: always pass user data to "system" as a listJeff King2008-04-291-1/+1
| | * | | | | | fix reflog approxidate parsing bugJeff King2008-04-291-2/+5
| * | | | | | | Fix use after free() in builtin-fetchAlex Riesen2008-04-281-3/+5
| * | | | | | | fetch-pack: do not stop traversing an already parsed commitLinus Torvalds2008-04-281-4/+4