summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refactor ref status logic for pushingTay Ray Chuan2010-01-096-48/+77
* t5541-http-push.sh: add test for unmatched, non-fast-forwarded refsTay Ray Chuan2010-01-091-0/+21
* t5541-http-push.sh: add tests for non-fast-forward pushesTay Ray Chuan2010-01-091-0/+23
* Merge branch 'jk/1.7.0-status'Junio C Hamano2009-12-2711-95/+672
|\
| * status/commit: do not suggest "reset HEAD <path>" while mergingJunio C Hamano2009-12-124-5/+13
| * commit/status: "git add <path>" is not necessarily how to resolveJunio C Hamano2009-12-122-2/+2
| * commit/status: check $GIT_DIR/MERGE_HEAD only onceJunio C Hamano2009-12-121-6/+4
| * t7508-status: test all modes with colorMichael J Gruber2009-12-083-44/+156
| * t7508-status: status --porcelain ignores relative paths settingMichael J Gruber2009-12-081-0/+18
| * status: reduce duplicated setup codeJeff King2009-12-072-12/+9
| * status: disable color for porcelain formatJeff King2009-12-073-2/+9
| * status -s: obey color.statusMichael J Gruber2009-12-052-7/+18
| * builtin-commit: refactor short-status code into wt-status.cMichael J Gruber2009-12-053-97/+95
| * t7508-status.sh: Add tests for status -sMichael J Gruber2009-11-271-0/+166
| * status -s: respect the status.relativePaths optionMichael J Gruber2009-11-262-2/+4
| * docs: note that status configuration affects only long formatJeff King2009-09-051-5/+5
| * commit: support alternate status formatsJeff King2009-09-052-7/+46
| * status: add --porcelain output formatJeff King2009-09-052-3/+15
| * status: refactor format option parsingJeff King2009-09-051-7/+14
| * status: refactor short-mode printing to its own functionJeff King2009-09-051-20/+25
| * status: typo fix in usageJeff King2009-09-051-1/+1
| * git status: not "commit --dry-run" anymoreJunio C Hamano2009-08-229-50/+89
| * git stat -s: short status outputJunio C Hamano2009-08-221-8/+106
| * git stat: the beginning of "status that is not a dry-run of commit"Junio C Hamano2009-08-226-14/+75
* | Merge branch 'maint'Junio C Hamano2009-12-271-1/+1
|\ \
| * \ Merge branch 'nf/maint-fix-index-ext-len-on-be64' into maintJunio C Hamano2009-12-271-1/+1
| |\ \
| | * | read_index(): fix reading extension size on BE 64-bit archsNathaniel W Filardo2009-12-271-1/+1
* | | | Merge branch 'maint'Junio C Hamano2009-12-265-29/+46
|\ \ \ \ | |/ / /
| * | | Makefile: FreeBSD (both 7 and 8) needs OLD_ICONVJunio C Hamano2009-12-261-0/+1
| * | | Start 1.6.6.X maintenance trackJunio C Hamano2009-12-262-1/+16
| * | | Merge branch 'jc/maint-obsd46' into maintJunio C Hamano2009-12-262-29/+29
| |\ \ \
| | * | | t4019 "grep" portability fixJunio C Hamano2009-12-261-28/+28
| | * | | t1200: work around a bug in some implementations of "find"Junio C Hamano2009-12-261-1/+1
| * | | | Add git-http-backend to command-list.Tarmigan Casebolt2009-12-261-0/+1
| |/ / /
* | | | Kick off 1.7.0 cycleJunio C Hamano2009-12-263-2/+66
* | | | Merge branch 'gb/1.7.0-diff-whitespace-only-output'Junio C Hamano2009-12-262-10/+39
|\ \ \ \
| * | | | No diff -b/-w output for all-whitespace changesGreg Bacon2009-11-202-10/+39
* | | | | Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano2009-12-268-13/+105
|\ \ \ \ \
| * | | | | diff.c: fix typoes in commentsJim Meyering2009-08-301-2/+2
| * | | | | Make test case number uniqueJohannes Sixt2009-08-271-0/+0
| * | | | | diff: Rename QUIET internal option to QUICKJunio C Hamano2009-07-297-9/+9
| * | | | | diff: change semantics of "ignore whitespace" optionsJunio C Hamano2009-07-294-4/+97
* | | | | | Merge branch 'jc/1.7.0-push-safety'Junio C Hamano2009-12-268-58/+54
|\ \ \ \ \ \
| * | | | | | Refuse deleting the current branch via pushJunio C Hamano2009-07-292-25/+14
| * | | | | | Refuse updating the current branch in a non-bare repository via pushJunio C Hamano2009-07-298-33/+40
* | | | | | | Merge branch 'jc/1.7.0-send-email-no-thread-default'Junio C Hamano2009-12-262-6/+6
|\ \ \ \ \ \ \
| * | | | | | | send-email: make --no-chain-reply-to the defaultJunio C Hamano2009-08-222-5/+5
* | | | | | | | Merge branch 'sr/vcs-helper'Junio C Hamano2009-12-2621-48/+1322
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | tests: handle NO_PYTHON settingJeff King2009-12-072-3/+4
| * | | | | | | builtin-push: don't access freed transport->urlTay Ray Chuan2009-12-031-2/+3
View Lorry Controller Status