github github
  • Home
  • Pricing and Signup
  • Training
  • Gist
  • Blog
  • Login

symfony / symfony

  • Admin
  • Watch Unwatch
  • Fork
  • Your Fork
    • 1,064
    • 193
  • Source
  • Commits
  • Network
  • Pull Requests (3)
  • Graphs
  • Branch: master

click here to add a description

click here to add a homepage

  • Graph
  • Members

FabienPennequin wants someone to pull 0 commits into symfony:93f2d6eaa64fe1df46f9 from FabienPennequin:ee6989ecebb64928b5e2

  • Discussion
  • Commits 0
  • Files Changed 0
  • Reply

Showing 3 comments with 0 commits and 0 commit comments

#8 Closed

Fix invalid help command shortcut (ticket #8890)

FabienPennequin — Sat Sep 11 05:05:13 -0700 2010

If you enter an invalid command in your terminal, it is shown that we can use the option -h for help, but this doesn't work because symfony expects that we use -H. These commits fix this and add tests on command shortcuts.

jmikola commented

Sat Sep 11 11:24:20 -0700 2010

Assuming symfony and fabpot are both remotes on your fork, consider using git pull --rebase fabpot master to merge in upstream changes, which should eliminate the "Merge remote branch" commits in your own repository. For more info, see:

http://www.doctrine-project.org/contribute#contributor-workflow:keeping-your-master-up-to-date!

fabpot commented

Sat Sep 11 23:06:45 -0700 2010

Can you rebase your repository to the latest fabpot/master? As is, it does not apply cleanly (Components -> Component). Thanks.

FabienPennequin commented

Mon Sep 13 10:59:07 -0700 2010

@jmikola: Thanks for the tip!

@fabpot: I just rebased my symfony repository with your. See http://github.com/FabienPennequin/symfony/tree/ticket_8890

Comment on this pull request

You must be logged in to comment on pull requests.

Active Participants

  • FabienPennequin
  • jmikola
  • fabpot

Showing 0 unique commits by 0 authors.

Showing 0 changed files with 0 additions and 0 deletions.

Dedicated Server Powered by the Dedicated Servers and
Cloud Computing of Rackspace Hosting®
  • Blog
  • Support
  • Training
  • Job Board
  • Shop
  • Contact
  • API
  • Status
  • © 2010 GitHub Inc. All rights reserved.
  • Terms of Service
  • Privacy
  • Security
  • English
  • Deutsch
  • Français
  • 日本語
  • Português (BR)
  • Русский
  • 中文
  • See all available languages

Your current locale selection: English. Choose another?

  • English
  • Afrikaans
  • Català
  • Čeština
  • Deutsch
  • Español
  • Français
  • Hrvatski
  • Indonesia
  • Italiano
  • 日本語
  • Nederlands
  • Norsk
  • Polski
  • Português (BR)
  • Русский
  • Српски
  • Svenska
  • 中文

Keyboard Shortcuts

Site wide shortcuts

s
Focus site search
?
Bring up this help dialog

Commit list

j
Move selected down
k
Move selected up
t
Open tree
p
Open parent
c or o or enter
Open commit

Pull request list

j
Move selected down
k
Move selected up
o or enter
Open issue

Issues

j
Move selected down
k
Move selected up
x
Toggle select target
o or enter
Open issue
I
Mark selected as read
U
Mark selected as unread
e
Close selected
y
Remove selected from view
c
Create issue
l
Create label
i
Back to inbox
u
Back to issues
/
Focus issues search

Network Graph

← or h
Scroll left
→ or l
Scroll right
↑ or k
Scroll up
↓ or j
Scroll down
t
Toggle visibility of head labels
shift ← or shift h
Scroll all the way left
shift → or shift l
Scroll all the way right
shift ↑ or shift k
Scroll all the way up
shift ↓ or shift j
Scroll all the way down