summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | Add git-describe test for "verify annotated tag names on output"Shawn O. Pearce2008-03-031-1/+16
* | | | | | | | | | | | | Test for packed tags in git-describe outputShawn O. Pearce2008-03-031-0/+3
* | | | | | | | | | | | | Don't allow git-describe failures to go unnoticed in t6120Shawn O. Pearce2008-03-031-1/+3
* | | | | | | | | | | | | describe: re-fix display_name()Junio C Hamano2008-03-031-1/+1
* | | | | | | | | | | | | describe: fix --long outputJunio C Hamano2008-03-031-5/+11
* | | | | | | | | | | | | git-describe: use tags found in packed-refs correctlyJunio C Hamano2008-03-031-1/+1
* | | | | | | | | | | | | fetch-pack: check parse_commit/object resultsMartin Koegler2008-03-031-7/+10
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Update draft release notes for 1.5.5Junio C Hamano2008-03-031-1/+27
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-03-025-6/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Update draft release notes for 1.5.4.4Junio C Hamano2008-03-021-1/+21
| * | | | | | | | | | revert: actually check for a dirty indexJeff King2008-03-022-4/+25
| * | | | | | | | | | tests: introduce test_must_failJunio C Hamano2008-03-022-8/+25
View Lorry Controller Status