summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/rebase-fixup'Junio C Hamano2010-01-203-112/+219
|\
| * rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty2010-01-142-39/+63
| * t3404: Set up more of the test repo in the "setup" stepMichael Haggerty2010-01-141-25/+26
| * rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty2010-01-142-31/+57
| * rebase -i: Change function make_squash_message into update_squash_messageMichael Haggerty2010-01-141-15/+20
| * rebase -i: Extract function do_with_authorMichael Haggerty2010-01-141-12/+15
| * rebase -i: Handle the author script all in one place in do_nextMichael Haggerty2010-01-141-2/+2
| * rebase -i: Extract a function "commit_message"Michael Haggerty2010-01-141-5/+10
| * rebase -i: Simplify commit counting for generated commit messagesMichael Haggerty2010-01-141-8/+3
| * rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty2010-01-142-3/+3
| * t3404: Test the commit count in commit messages generated by "rebase -i"Michael Haggerty2010-01-142-3/+12
| * rebase -i: Introduce a constant AMENDMichael Haggerty2010-01-141-4/+12
| * rebase -i: Introduce a constant AUTHOR_SCRIPTMichael Haggerty2010-01-141-6/+11
| * rebase -i: Document how temporary files are usedMichael Haggerty2010-01-141-7/+34
| * rebase -i: Use symbolic constant $MSG consistentlyMichael Haggerty2010-01-141-4/+4
| * rebase -i: Use "test -n" instead of "test ! -z"Michael Haggerty2010-01-141-1/+1
| * rebase -i: Inline expressionMichael Haggerty2010-01-141-2/+1
| * rebase -i: Remove dead codeMichael Haggerty2010-01-141-1/+0
| * rebase -i: Make the condition for an "if" more transparentMichael Haggerty2010-01-141-1/+2
* | Merge branch 'ns/rebase-auto-squash'Junio C Hamano2010-01-203-0/+120
|\ \
| * | rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-063-0/+120
* | | Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano2010-01-204-68/+137
|\ \ \ | | |/ | |/|
| * | rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-122-1/+25
| * | lib-rebase: Allow comments and blank lines to be added to the rebase scriptMichael Haggerty2010-01-121-5/+16
| * | lib-rebase: Provide clearer debugging info about what the editor didMichael Haggerty2010-01-121-2/+3
| |/
| * Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-074-18/+77
| * t3404: Use test_commit to set up test repositoryMichael Haggerty2009-12-061-46/+20
* | Merge branch 'il/push-set-upstream'Junio C Hamano2010-01-205-1/+136
|\ \
| * | Add push --set-upstreamIlari Liusvaara2010-01-165-1/+136
* | | Merge branch 'jk/warn-author-committer-after-commit'Junio C Hamano2010-01-2011-5/+88
|\ \ \
| * | | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereJunio C Hamano2010-01-173-2/+8
| * | | commit.c::print_summary: do not release the format string too earlyJunio C Hamano2010-01-171-1/+1
| * | | commit: allow suppression of implicit identity adviceJeff King2010-01-144-2/+11
| * | | commit: show interesting ident information in summaryJeff King2010-01-142-4/+42
| * | | strbuf: add strbuf_addbuf_percentquoteJeff King2010-01-143-0/+19
| * | | strbuf_expand: convert "%%" to "%"Jeff King2010-01-145-1/+18
* | | | Merge branch 'jc/ident'Junio C Hamano2010-01-204-13/+24
|\ \ \ \
| * | | | ident.c: replace fprintf with fputs to suppress compiler warningTarmigan Casebolt2010-01-191-1/+1
| * | | | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereJunio C Hamano2010-01-173-1/+11
| * | | | ident.c: treat $EMAIL as giving user.email identity explicitlyJunio C Hamano2010-01-101-2/+3
| * | | | ident.c: check explicit identity for name and email separatelyJunio C Hamano2010-01-104-8/+10
| * | | | ident.c: remove unused variablesJunio C Hamano2010-01-081-3/+1
* | | | | Merge branch 'tr/http-push-ref-status'Junio C Hamano2010-01-206-49/+137
|\ \ \ \ \
| * | | | | transport-helper.c::push_refs(): emit "no refs" error messageTay Ray Chuan2010-01-091-1/+4
| * | | | | transport-helper.c::push_refs(): ignore helper-reported status if ref is not ...Tay Ray Chuan2010-01-092-1/+10
| * | | | | transport.c::transport_push(): make ref status affect return valueTay Ray Chuan2010-01-092-4/+7
| * | | | | 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 'bk/fix-relative-gitdir-file'Junio C Hamano2010-01-202-3/+57
|\ \ \ \ \ \
View Lorry Controller Status