summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / / / / |/| | | | | |
* | | | | | | fsck.c: fix bogus "empty tree" checkJunio C Hamano2008-03-051-2/+0
|/ / / / / /
* | | | | | Revert "unpack-objects: prevent writing of inconsistent objects"Junio C Hamano2008-03-042-106/+7
* | | | | | Revert "receive-pack: use strict mode for unpacking objects"Junio C Hamano2008-03-042-29/+13
* | | | | | Merge branch 'maint'Junio C Hamano2008-03-045-22/+23
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix 'git remote show' regression on empty repository in 1.5.4Shawn O. Pearce2008-03-031-4/+0
| * | | | | Fix incorrect wording in git-merge.txt.Matthieu Moy2008-03-031-1/+2
| * | | | | git-merge.sh: better handling of combined --squash,--no-ff,--no-commit optionsGerrit Pape2008-03-032-6/+17
| * | | | | Fix random crashes in http_cleanup()Mike Hommey2008-03-031-11/+3
* | | | | | t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --mergeMike Hommey2008-03-031-28/+40
* | | | | | git-p4: Fix import of changesets with file deletionsSimon Hausmann2008-03-031-20/+25
* | | | | | Fix test for cleanup failure in t7300 on WindowsAlex Riesen2008-03-031-1/+2
* | | | | | t6120 (describe): check --long properlyJunio C Hamano2008-03-031-0/+1
View Lorry Controller Status