summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint' to sync with 1.5.4.4Junio C Hamano2008-03-087-14/+39
|\
| * GIT 1.5.4.4v1.5.4.4Junio C Hamano2008-03-082-7/+27
| * ident.c: reword error message when the user name cannot be determinedSanti Béjar2008-03-081-1/+1
| * Fix dcommit, rebase when rewriteRoot is in useJohn Goerzen2008-03-081-1/+6
| * Really make the LF after reset in fast-import optionalAdeodato Simó2008-03-082-1/+4
| * Merge branch 'mh/maint-http-proxy-fix' into maintJunio C Hamano2008-03-087-12/+22
| |\
| * \ Merge branch 'js/maint-daemon' into maintJunio C Hamano2008-03-081-5/+13
| |\ \
| * \ \ Merge branch 'js/maint-cvsexport' into maintJunio C Hamano2008-03-082-8/+67
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-log-merge-left-right' into maintJunio C Hamano2008-03-081-8/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'ew/maint-svn-cert-fileprovider' into maintJunio C Hamano2008-03-081-0/+1
| |\ \ \ \ \
* | | | | | | merge-tool documentation: describe custom command usageCharles Bailey2008-03-081-0/+22
* | | | | | | git-mergetool documentaiton: show toolnames in typewriter fontCharles Bailey2008-03-081-8/+8
* | | | | | | Merge branch 'aw/maint-shortlog-blank-lines'Junio C Hamano2008-03-081-2/+3
|\ \ \ \ \ \ \
| * | | | | | | shortlog: take the first populated line of the descriptionAndy Whitcroft2008-03-051-2/+3
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-03-074-12/+27
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | unquote_c_style: fix off-by-one.Pierre Habouzit2008-03-071-1/+1
| * | | | | | | test-lib: fix TERM to dumb for test repeatabilityJunio C Hamano2008-03-071-7/+17
| * | | | | | | config.txt: refer to --upload-pack and --receive-pack instead of --execUwe Kleine-König2008-03-071-4/+4
| * | | | | | | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2008-03-061-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl failsShawn O. Pearce2008-03-051-0/+5
* | | | | | | | send-email: --no-signed-off-cc should suppress 'sob' ccJunio C Hamano2008-03-071-1/+2
* | | | | | | | Merge branch 'js/reflog-delete'Junio C Hamano2008-03-078-7/+245
|\ \ \ \ \ \ \ \
| * | | | | | | | t3903-stash.sh: Add tests for new stash commands drop and popBrandon Casey2008-03-031-1/+45
| * | | | | | | | git-reflog.txt: Document new commands --updateref and --rewriteBrandon Casey2008-03-031-0/+9
| * | | | | | | | t3903-stash.sh: Add missing '&&' to body of testcaseBrandon Casey2008-03-031-2/+2
| * | | | | | | | Merge commit '74359821' into js/reflog-deleteJunio C Hamano2008-03-03125-1334/+4189
| |\ \ \ \ \ \ \ \
| * | | | | | | | | git-stash: add new 'pop' subcommandBrandon Casey2008-02-222-2/+16
| * | | | | | | | | git-stash: add new 'drop' subcommandBrandon Casey2008-02-222-2/+33
| * | | | | | | | | git-reflog: add option --updateref to write the last reflog sha1 into the refBrandon Casey2008-02-221-1/+16
| * | | | | | | | | refs.c: make close_ref() and commit_ref() non-staticBrandon Casey2008-02-222-2/+8
| * | | | | | | | | git-reflog: add option --rewrite to update reflog entries while expiringBrandon Casey2008-02-221-1/+11
| * | | | | | | | | reflog-delete: parse standard reflog optionsBrandon Casey2008-02-221-3/+21
| * | | | | | | | | Merge branch 'bc/reflog-fix' into js/reflog-deleteJunio C Hamano2008-02-22691-14455/+56188
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin-reflog.c: fix typo that accesses an unset variableBrandon Casey2008-01-041-1/+1
| * | | | | | | | | | Teach "git reflog" a subcommand to delete single entriesJohannes Schindelin2007-10-173-0/+90
* | | | | | | | | | | Merge branch 'dc/format-pretty'Junio C Hamano2008-03-078-9/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | log/show/whatchanged: introduce format.pretty configurationDenis Cheng2008-03-053-0/+13
| * | | | | | | | | | | specify explicit "--pretty=medium" with `git log/show/whatchanged`Denis Cheng2008-03-054-4/+4
| * | | | | | | | | | | whatchanged documentation: share description of --pretty with othersDenis Cheng2008-03-051-5/+4
* | | | | | | | | | | | Merge branch 'cb/mergetool'Junio C Hamano2008-03-073-76/+162
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a very basic test script for git mergetoolCharles Bailey2008-03-051-0/+46
| * | | | | | | | | | | | Teach git mergetool to use custom commands defined at config timeCharles Bailey2008-03-052-4/+49
| * | | | | | | | | | | | Changed an internal variable of mergetool to support custom commandsCharles Bailey2008-03-051-50/+50
| * | | | | | | | | | | | Tidy up git mergetool's backup file behaviourCharles Bailey2008-03-052-24/+19
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ar/sgid-bsd'Junio C Hamano2008-03-073-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Do not use GUID on dir in git init --shared=all on FreeBSDAlex Riesen2008-03-053-1/+11
* | | | | | | | | | | | | Merge branch 'cc/run-command'Junio C Hamano2008-03-072-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | run-command: Redirect stderr to a pipe before redirecting stdout to stderrChristian Couder2008-03-052-10/+11
* | | | | | | | | | | | | bash: git-branch -d and -m lists only local branchesSZEDER Gábor2008-03-051-1/+18
* | | | | | | | | | | | | bash: add git-branch optionsSZEDER Gábor2008-03-051-1/+10
| |/ / / / / / / / / / / |/| | | | | | | | | | |
View Lorry Controller Status