Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cat #27

Open
wants to merge 53 commits into
base: main
Choose a base branch
from
Open

Cat #27

wants to merge 53 commits into from

Conversation

SzAkos04
Copy link

Added support for --version, --help (Not fully done yet), --show-ends, --number and --show-tabs. Not fully complete yet, but I'm working on it.

@proh14
Copy link
Owner

proh14 commented Apr 17, 2024

@SzAkos04 can you add the author information to the file? take a look at echo's source

@proh14
Copy link
Owner

proh14 commented Apr 17, 2024

ok will merge after fully implemented(you don't need to do the manpage) ;)

@SzAkos04
Copy link
Author

Oops, that 4186ef0 commit was supposed to be Implemented number-nonblank

@Sigmanificient Sigmanificient linked an issue Apr 19, 2024 that may be closed by this pull request
@Sigmanificient
Copy link
Collaborator

Sigmanificient commented Apr 19, 2024

Can you rebase your branch now that we have GitHub action available for pr? thx

@Sigmanificient
Copy link
Collaborator

The rebased commit shouldn't appear in the file tree / history, did you get a conflict while rebasing?

src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
@SzAkos04
Copy link
Author

I ran these commands:
git rebase origin/main
git push --force-with-lease

@SzAkos04
Copy link
Author

Yeah sorry I'm quite new to this, thanks for the help

src/cat/cat.c Outdated Show resolved Hide resolved
src/cat/cat.c Outdated Show resolved Hide resolved
@Sigmanificient
Copy link
Collaborator

we are having some discussion on some point on the CobbCoding discord

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cat base
3 participants