Scott Chacon discusses revision selection and ranges in Git. He covers specifying commits using full or partial SHA-1s, branches/tags, caret and tilde syntax, relative specs, and ranges to select all commits between two points. Advanced topics include using origin/master.. to see what will be pushed and log subsets to inspect subsets of history.
Semantics have been an underlining part of HTML for years, using elements, attributes, and values to reinforce the meaning of content. In the wake of popularity, HTML5 has expanded the library of semantic options and cleaned up former semantic options along the way. These improved semantics advocate accessibility and progressive enhancement, providing more intuitive user interfaces and mobile supplementation. One problem still looms, semantics are only of benefit when used properly. Adoption at large is necessary, and essential to building a better web.
Work on HTML5 began in 2004 to improve the existing markup language which has been in place for the past decade. In this decade the web has grown and evolved quite a bit, leaving web designers and developers much to ask for. HTML5 responds to those request and helps pave the way for a new frontier in front-end development. HTML5 introduces new elements, a more semantic structure, improved form functionality, better media control and more for the growing web.
Yes, Designer, You CAN Be a Product LeaderShay Howe
There are many different ways to get into product leadership, and as a designer you are better suited than most. You have a knack for details, problem solving, and organization. And those skills, believe it or not, make you better suited to get your start in product leadership than many other career paths.
Over the course of my career I’ve been a designer, front-end engineer, and now, most recently, a product leader. I’m ready to demystify what it takes to become a product leader, share the steps I took, and provide advice so that you too may jump into product.
It’s not a journey without it’s struggles but it’s ripe with opportunity and enjoyment!
Semantics have been an underlining part of HTML for years, using elements, attributes, and values to reinforce the meaning of content. In the wake of popularity, HTML5 has expanded the library of semantic options and cleaned up former semantic options along the way. These improved semantics advocate accessibility and progressive enhancement, providing more intuitive user interfaces and mobile supplementation. One problem still looms, semantics are only of benefit when used properly. Adoption at large is necessary, and essential to building a better web.
Work on HTML5 began in 2004 to improve the existing markup language which has been in place for the past decade. In this decade the web has grown and evolved quite a bit, leaving web designers and developers much to ask for. HTML5 responds to those request and helps pave the way for a new frontier in front-end development. HTML5 introduces new elements, a more semantic structure, improved form functionality, better media control and more for the growing web.
Yes, Designer, You CAN Be a Product LeaderShay Howe
There are many different ways to get into product leadership, and as a designer you are better suited than most. You have a knack for details, problem solving, and organization. And those skills, believe it or not, make you better suited to get your start in product leadership than many other career paths.
Over the course of my career I’ve been a designer, front-end engineer, and now, most recently, a product leader. I’m ready to demystify what it takes to become a product leader, share the steps I took, and provide advice so that you too may jump into product.
It’s not a journey without it’s struggles but it’s ripe with opportunity and enjoyment!
HTML and CSS can be a little daunting at first. This workshop covers the basics, breaks down the barrier to entry and shows you how you can start using HTML and CSS now.
Source Code Management and Version Control Systems are tools for helping you track your file based assets (typically source code). Traditional SCM systems are centralised (CVS, Subversion, Visual Source Safe), Distributed version control systems systems provide new capabilities, work-flows, are becoming mature and are gaining mind share in the open source community.
Git is one of those Distributed Version Control Systems. It was invented by the creator of Linux (Linus Torvalds) for protecting the Linux kernel source code and coordinating the activity of hundreds of developers. This talk discusses what Distributed Version Control is, the history of Git, basic version control features and some very uncommon and amazing capabilities of git. Time permitting it will include live demonstration of the tools.
CSS3 isn't the future, it's the present. Learn the gamut of CSS3 properties from colors, web fonts, and visual effects, to transitions, animations and media queries. Find the inspiration and resources to go forth and implement the new properties with confidence.
Introduction to Git/Github - A beginner's guideRohit Arora
Introduction to Git/Github - A beginner's guide
Agenda:
Installing Git
Introduction to Version Control
Git Basics
Creating a new local Git repository
Cloning a Git repository
Making use of Git commit history
Reverting files to previous states
Creating a Github Repository
Adding, Committing & Pushing changes
Branching
Merging Branches
Sending Pull Requests
Conflict Resolution
and 3 Exercises
Do you know the basics of Git but wonder what all the hype is about? Do you want the ultimate control over your Git history? This tutorial will walk you through the basics of committing changes before diving into the more advanced and "dangerous" Git commands.
Git is an open source, distributed version control system used to track many different projects. You can use it to manage anything from a personal notes directory to a multi-programmer project.
This tutorial provides a short walk through of basic git commands and the Git philosophy to project management. Then we’ll dive into an exploration of the more advanced and “dangerous” Git commands. Watch as we rewrite our repository history, track bugs down to a specific commit, and untangle commits into an LKML-worthy patchset.
about this presentation:
1) this presentation was a quickie for non-tech employees, who wanted a basic understanding of html/css, as it related to a white-label SAAS product;
2) the back-end/front-end definitions relate to the specific application (it's inaccurate if node.js is in the picture)
HTML and CSS can be a little daunting at first. This workshop covers the basics, breaks down the barrier to entry and shows you how you can start using HTML and CSS now.
Source Code Management and Version Control Systems are tools for helping you track your file based assets (typically source code). Traditional SCM systems are centralised (CVS, Subversion, Visual Source Safe), Distributed version control systems systems provide new capabilities, work-flows, are becoming mature and are gaining mind share in the open source community.
Git is one of those Distributed Version Control Systems. It was invented by the creator of Linux (Linus Torvalds) for protecting the Linux kernel source code and coordinating the activity of hundreds of developers. This talk discusses what Distributed Version Control is, the history of Git, basic version control features and some very uncommon and amazing capabilities of git. Time permitting it will include live demonstration of the tools.
CSS3 isn't the future, it's the present. Learn the gamut of CSS3 properties from colors, web fonts, and visual effects, to transitions, animations and media queries. Find the inspiration and resources to go forth and implement the new properties with confidence.
Introduction to Git/Github - A beginner's guideRohit Arora
Introduction to Git/Github - A beginner's guide
Agenda:
Installing Git
Introduction to Version Control
Git Basics
Creating a new local Git repository
Cloning a Git repository
Making use of Git commit history
Reverting files to previous states
Creating a Github Repository
Adding, Committing & Pushing changes
Branching
Merging Branches
Sending Pull Requests
Conflict Resolution
and 3 Exercises
Do you know the basics of Git but wonder what all the hype is about? Do you want the ultimate control over your Git history? This tutorial will walk you through the basics of committing changes before diving into the more advanced and "dangerous" Git commands.
Git is an open source, distributed version control system used to track many different projects. You can use it to manage anything from a personal notes directory to a multi-programmer project.
This tutorial provides a short walk through of basic git commands and the Git philosophy to project management. Then we’ll dive into an exploration of the more advanced and “dangerous” Git commands. Watch as we rewrite our repository history, track bugs down to a specific commit, and untangle commits into an LKML-worthy patchset.
about this presentation:
1) this presentation was a quickie for non-tech employees, who wanted a basic understanding of html/css, as it related to a white-label SAAS product;
2) the back-end/front-end definitions relate to the specific application (it's inaccurate if node.js is in the picture)
Encryption in Microsoft 365 - ExpertsLive Netherlands 2024Albert Hoitingh
In this session I delve into the encryption technology used in Microsoft 365 and Microsoft Purview. Including the concepts of Customer Key and Double Key Encryption.
20 Comprehensive Checklist of Designing and Developing a WebsitePixlogix Infotech
Dive into the world of Website Designing and Developing with Pixlogix! Looking to create a stunning online presence? Look no further! Our comprehensive checklist covers everything you need to know to craft a website that stands out. From user-friendly design to seamless functionality, we've got you covered. Don't miss out on this invaluable resource! Check out our checklist now at Pixlogix and start your journey towards a captivating online presence today.
Securing your Kubernetes cluster_ a step-by-step guide to success !KatiaHIMEUR1
Today, after several years of existence, an extremely active community and an ultra-dynamic ecosystem, Kubernetes has established itself as the de facto standard in container orchestration. Thanks to a wide range of managed services, it has never been so easy to set up a ready-to-use Kubernetes cluster.
However, this ease of use means that the subject of security in Kubernetes is often left for later, or even neglected. This exposes companies to significant risks.
In this talk, I'll show you step-by-step how to secure your Kubernetes cluster for greater peace of mind and reliability.
UiPath Test Automation using UiPath Test Suite series, part 6DianaGray10
Welcome to UiPath Test Automation using UiPath Test Suite series part 6. In this session, we will cover Test Automation with generative AI and Open AI.
UiPath Test Automation with generative AI and Open AI webinar offers an in-depth exploration of leveraging cutting-edge technologies for test automation within the UiPath platform. Attendees will delve into the integration of generative AI, a test automation solution, with Open AI advanced natural language processing capabilities.
Throughout the session, participants will discover how this synergy empowers testers to automate repetitive tasks, enhance testing accuracy, and expedite the software testing life cycle. Topics covered include the seamless integration process, practical use cases, and the benefits of harnessing AI-driven automation for UiPath testing initiatives. By attending this webinar, testers, and automation professionals can gain valuable insights into harnessing the power of AI to optimize their test automation workflows within the UiPath ecosystem, ultimately driving efficiency and quality in software development processes.
What will you get from this session?
1. Insights into integrating generative AI.
2. Understanding how this integration enhances test automation within the UiPath platform
3. Practical demonstrations
4. Exploration of real-world use cases illustrating the benefits of AI-driven test automation for UiPath
Topics covered:
What is generative AI
Test Automation with generative AI and Open AI.
UiPath integration with generative AI
Speaker:
Deepak Rai, Automation Practice Lead, Boundaryless Group and UiPath MVP
Pushing the limits of ePRTC: 100ns holdover for 100 daysAdtran
At WSTS 2024, Alon Stern explored the topic of parametric holdover and explained how recent research findings can be implemented in real-world PNT networks to achieve 100 nanoseconds of accuracy for up to 100 days.
Dr. Sean Tan, Head of Data Science, Changi Airport Group
Discover how Changi Airport Group (CAG) leverages graph technologies and generative AI to revolutionize their search capabilities. This session delves into the unique search needs of CAG’s diverse passengers and customers, showcasing how graph data structures enhance the accuracy and relevance of AI-generated search results, mitigating the risk of “hallucinations” and improving the overall customer journey.
GridMate - End to end testing is a critical piece to ensure quality and avoid...ThomasParaiso2
End to end testing is a critical piece to ensure quality and avoid regressions. In this session, we share our journey building an E2E testing pipeline for GridMate components (LWC and Aura) using Cypress, JSForce, FakerJS…
Building RAG with self-deployed Milvus vector database and Snowpark Container...Zilliz
This talk will give hands-on advice on building RAG applications with an open-source Milvus database deployed as a docker container. We will also introduce the integration of Milvus with Snowpark Container Services.
Sudheer Mechineni, Head of Application Frameworks, Standard Chartered Bank
Discover how Standard Chartered Bank harnessed the power of Neo4j to transform complex data access challenges into a dynamic, scalable graph database solution. This keynote will cover their journey from initial adoption to deploying a fully automated, enterprise-grade causal cluster, highlighting key strategies for modelling organisational changes and ensuring robust disaster recovery. Learn how these innovations have not only enhanced Standard Chartered Bank’s data infrastructure but also positioned them as pioneers in the banking sector’s adoption of graph technology.
Epistemic Interaction - tuning interfaces to provide information for AI supportAlan Dix
Paper presented at SYNERGY workshop at AVI 2024, Genoa, Italy. 3rd June 2024
https://alandix.com/academic/papers/synergy2024-epistemic/
As machine learning integrates deeper into human-computer interactions, the concept of epistemic interaction emerges, aiming to refine these interactions to enhance system adaptability. This approach encourages minor, intentional adjustments in user behaviour to enrich the data available for system learning. This paper introduces epistemic interaction within the context of human-system communication, illustrating how deliberate interaction design can improve system understanding and adaptation. Through concrete examples, we demonstrate the potential of epistemic interaction to significantly advance human-computer interaction by leveraging intuitive human communication strategies to inform system design and functionality, offering a novel pathway for enriching user-system engagements.
LF Energy Webinar: Electrical Grid Modelling and Simulation Through PowSyBl -...DanBrown980551
Do you want to learn how to model and simulate an electrical network from scratch in under an hour?
Then welcome to this PowSyBl workshop, hosted by Rte, the French Transmission System Operator (TSO)!
During the webinar, you will discover the PowSyBl ecosystem as well as handle and study an electrical network through an interactive Python notebook.
PowSyBl is an open source project hosted by LF Energy, which offers a comprehensive set of features for electrical grid modelling and simulation. Among other advanced features, PowSyBl provides:
- A fully editable and extendable library for grid component modelling;
- Visualization tools to display your network;
- Grid simulation tools, such as power flows, security analyses (with or without remedial actions) and sensitivity analyses;
The framework is mostly written in Java, with a Python binding so that Python developers can access PowSyBl functionalities as well.
What you will learn during the webinar:
- For beginners: discover PowSyBl's functionalities through a quick general presentation and the notebook, without needing any expert coding skills;
- For advanced developers: master the skills to efficiently apply PowSyBl functionalities to your real-world scenarios.
Threats to mobile devices are more prevalent and increasing in scope and complexity. Users of mobile devices desire to take full advantage of the features
available on those devices, but many of the features provide convenience and capability but sacrifice security. This best practices guide outlines steps the users can take to better protect personal devices and information.
Goodbye Windows 11: Make Way for Nitrux Linux 3.5.0!SOFTTECHHUB
As the digital landscape continually evolves, operating systems play a critical role in shaping user experiences and productivity. The launch of Nitrux Linux 3.5.0 marks a significant milestone, offering a robust alternative to traditional systems such as Windows 11. This article delves into the essence of Nitrux Linux 3.5.0, exploring its unique features, advantages, and how it stands as a compelling choice for both casual users and tech enthusiasts.
In the rapidly evolving landscape of technologies, XML continues to play a vital role in structuring, storing, and transporting data across diverse systems. The recent advancements in artificial intelligence (AI) present new methodologies for enhancing XML development workflows, introducing efficiency, automation, and intelligent capabilities. This presentation will outline the scope and perspective of utilizing AI in XML development. The potential benefits and the possible pitfalls will be highlighted, providing a balanced view of the subject.
We will explore the capabilities of AI in understanding XML markup languages and autonomously creating structured XML content. Additionally, we will examine the capacity of AI to enrich plain text with appropriate XML markup. Practical examples and methodological guidelines will be provided to elucidate how AI can be effectively prompted to interpret and generate accurate XML markup.
Further emphasis will be placed on the role of AI in developing XSLT, or schemas such as XSD and Schematron. We will address the techniques and strategies adopted to create prompts for generating code, explaining code, or refactoring the code, and the results achieved.
The discussion will extend to how AI can be used to transform XML content. In particular, the focus will be on the use of AI XPath extension functions in XSLT, Schematron, Schematron Quick Fixes, or for XML content refactoring.
The presentation aims to deliver a comprehensive overview of AI usage in XML development, providing attendees with the necessary knowledge to make informed decisions. Whether you’re at the early stages of adopting AI or considering integrating it in advanced XML development, this presentation will cover all levels of expertise.
By highlighting the potential advantages and challenges of integrating AI with XML development tools and languages, the presentation seeks to inspire thoughtful conversation around the future of XML development. We’ll not only delve into the technical aspects of AI-powered XML development but also discuss practical implications and possible future directions.
GraphSummit Singapore | The Art of the Possible with Graph - Q2 2024Neo4j
Neha Bajwa, Vice President of Product Marketing, Neo4j
Join us as we explore breakthrough innovations enabled by interconnected data and AI. Discover firsthand how organizations use relationships in data to uncover contextual insights and solve our most pressing challenges – from optimizing supply chains, detecting fraud, and improving customer experiences to accelerating drug discoveries.
20. 98ca9.. 34ac2.. f30ab..
commit commit commit
size size size
tree tree tree
0de24 184ca 92ec2
author parent parent
Scott 98ca9 34ac2
committer author author
Scott Scott Scott
committer committer
initial commit of my project Scott Scott
fixed bug #1328 - stack add feature #32 - ability to
overflow under certain add new formats to the central
snapshot A snapshot B snapshot C
21. 98ca9..
e8455..
commit size
blob size
0de24..
0de24..
tree 0de24
== LICENSE:
tree size
parent nil
(The MIT License)
author Scott blob e8455 README Copyright (c) 2007 Tom Preston-
committer Scott
tree 10af9 lib Permission is hereby granted, f
my commit message goes here ree of charge, to any person ob
and it is really, really cool
bc52a..
10af9..
blob size
tree size
require 'grit/index'
blob bc52a mylib.rb require 'grit/status'
tree b70f8 inc
module Grit
class << self
attr_accessor :debug
b70f8..
0ad1a..
tree size
size
blob
blob 0ad1a tricks.rb
require 'grit/git-ruby/reposi
require 'grit/git-ruby/file_i
module Grit
module Tricks
22. 98ca9..
e8455..
commit size
blob size
0de24..
0de24..
tree 0de24
== LICENSE:
tree size
parent nil
(The MIT License)
author Scott blob e8455 README Copyright (c) 2007 Tom Preston-
committer Scott
tree 10af9 lib Permission is hereby granted, f
my commit message goes here ree of charge, to any person ob
and it is really, really cool
bc52a..
10af9..
blob size
tree size
require 'grit/index'
blob bc52a mylib.rb require 'grit/status'
tree b70f8 inc
module Grit
class << self
attr_accessor :debug
b70f8..
0ad1a..
tree size
size
blob
blob 0ad1a tricks.rb
require 'grit/git-ruby/reposi
require 'grit/git-ruby/file_i
module Grit
module Tricks
96. commit 72d404debaa804fca82fd9cf710fbde48c7305c6
Author: Shawn O. Pearce <spearce@spearce.org>
Date: Sun Oct 12 13:13:59 2008 -0700
test-lib: fix broken printf
b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of
printf without a format string.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
commit 969c877506cf8cc760c7b251fef6c5b6850bfc19
Author: Jeff King <peff@peff.net>
Date: Sun Oct 12 00:06:11 2008 -0400
git apply --directory broken for new files
We carefully verify that the input to git-apply is sane,
including cross-checking that the filenames we see in quot;+++quot;
headers match what was provided on the command line of quot;diff
--gitquot;. When --directory is used, however, we ended up
comparing the unadorned name to one with the prepended root,
causing us to complain about a mismatch.
We simply need to prepend the root directory, if any, when
pulling the name out of the git header.
commit ff74126c03a8dfd04e7533573a5c420f2a7112ac
Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri Oct 10 13:42:12 2008 +0200
rebase -i: do not fail when there is no commit to cherry-pick
97. commit 72d404debaa804fca82fd9cf710fbde48c7305c6
C4 Author: Shawn O. Pearce <spearce@spearce.org>
Date: Sun Oct 12 13:13:59 2008 -0700
test-lib: fix broken printf
b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of
printf without a format string.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
commit 969c877506cf8cc760c7b251fef6c5b6850bfc19
C3 Author: Jeff King <peff@peff.net>
Date: Sun Oct 12 00:06:11 2008 -0400
git apply --directory broken for new files
We carefully verify that the input to git-apply is sane,
including cross-checking that the filenames we see in quot;+++quot;
headers match what was provided on the command line of quot;diff
--gitquot;. When --directory is used, however, we ended up
comparing the unadorned name to one with the prepended root,
causing us to complain about a mismatch.
We simply need to prepend the root directory, if any, when
pulling the name out of the git header.
commit ff74126c03a8dfd04e7533573a5c420f2a7112ac
C2 Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri Oct 10 13:42:12 2008 +0200
rebase -i: do not fail when there is no commit to cherry-pick
98. C7 C4
origin/master master HEAD
C6 C3
C5 C2
C1
git log
origin/master .. HEAD
C0
99. C7 C4
origin/master master HEAD
C6 C3
C5 C2
C1
git log
HEAD .. origin/master
C0
100. C7 C4
origin/master master HEAD
C6 C3
C5 C2
C1
git log
HEAD .. origin/master
C0
“commits in origin/master
not in HEAD”
129. master topic
what does topic have
$ git diff topic
C5 C3
that I don’t have?
C4 C2
C1
130. master topic
what would happen if I
$ git diff topic
C5 C3
merged in topic?
C4 C2
C1
131. master topic
how do I make topic
$ git diff topic
C5 C3
look like HEAD?
C4 C2
C1
132. $ git diff topic
diff --git a/test b/test
master topic
index 304313d..bd8c6c9 100644
--- a/test
+++ b/test
C5 C3 @@ -1,3 +1,3 @@
version one
-version two
-version three
C4 C2 +version four
+version five
C1
133. $ git diff topic
diff --git a/test b/test
master topic
index 304313d..bd8c6c9 100644
--- a/test
+++ b/test
C5 C3 @@ -1,3 +1,3 @@
version one
-version two
-version three
C4 C2 +version four
+version five
C1
134. $ git diff HEAD topic
diff --git a/test b/test
master topic
index bd8c6c9..304313d 100644
--- a/test
+++ b/test
C5 C3 @@ -1,3 +1,3 @@
version one
-version four
-version five
C4 C2 +version two
+version three
C1
135. $ git diff HEAD topic
diff --git a/test b/test
master topic
index bd8c6c9..304313d 100644
--- a/test
+++ b/test
C5 C3 @@ -1,3 +1,3 @@
version one
-version four
-version five
C4 C2 +version two
+version three
C1
142. $ git diff HEAD...topic
diff --git a/test b/test
master topic index 9bc69cf..304313d 100644
--- a/test
+++ b/test
@@ -1 +1,3 @@
C5 C3
version one
+version two
+version three
C4 C2
C1
143. $ git diff HEAD...topic
diff --git a/test b/test
master topic index 9bc69cf..304313d 100644
--- a/test
what would happen if I
+++ b/test
@@ -1 +1,3 @@
C5 C3
merged in topic?
version one
+version two
+version three
C4 C2
C1
216. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
217. C2
pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
C3
pick 72d404d test-lib: fix broken printf
C4
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
218. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
219. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
220. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
221. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
222. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
223. edit 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
224. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
225. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
edit files
git add
git commit --amend
git rebase --continue
226. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
edit files
git add
git commit --amend
git rebase --continue
227. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
edit files
git add
git commit --amend
git rebase --continue
228. $ git rebase -i default~2^
Stopped at 969c877... git apply --directory broken for new files
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$_
edit files
git add
git commit --amend
git rebase --continue
233. pick 969c877 git apply --directory broken for new files
pick b75271d git diff <tree>{3,}: do not reverse order of args
pick 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
234. pick 969c877 git apply --directory broken for new files
squash b75271d git diff <tree>{3,}: do not reverse order of args
squash 72d404d test-lib: fix broken printf
# Rebase f285a2d..5c283eb onto f285a2d
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
~
~
quot;~/projects/git/.git/rebase-merge/git-rebase-todoquot; 14L, 472C
235. # This is a combination of 3 commits.
# The first commit's message is:
git apply --directory broken for new files
# This is the 2nd commit message:
git diff <tree>{3,}: do not reverse order of args
# This is the 3rd commit message:
test-lib: fix broken printf
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author: Jeff King <peff@peff.net>
#
# Not currently on any branch.
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: builtin-apply.c
# modified: builtin-diff.c
# modified: t/t4013-diff-various.sh
# new file: t/t4013/diff.diff_master_master^_side
# modified: t/t4128-apply-root.sh
# modified: t/test-lib.sh
#
~
~
quot;.git/COMMIT_EDITMSGquot; 39L, 1454C
236. # This is a combination of 3 commits.
# The first commit's message is:
git apply --directory broken for new files
# This is the 2nd commit message:
git diff <tree>{3,}: do not reverse order of args
# This is the 3rd commit message:
test-lib: fix broken printf
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author: Jeff King <peff@peff.net>
#
# Not currently on any branch.
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: builtin-apply.c
# modified: builtin-diff.c
# modified: t/t4013-diff-various.sh
# new file: t/t4013/diff.diff_master_master^_side
# modified: t/t4128-apply-root.sh
# modified: t/test-lib.sh
#
~
~
quot;.git/COMMIT_EDITMSGquot; 39L, 1454C
237. # This is a combination of 3 commits.
# The first commit's message is:
git apply --directory broken for new files
# This is the 2nd commit message:
git diff <tree>{3,}: do not reverse order of args
# This is the 3rd commit message:
test-lib: fix broken printf
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author: Jeff King <peff@peff.net>
#
# Not currently on any branch.
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: builtin-apply.c
# modified: builtin-diff.c
# modified: t/t4013-diff-various.sh
# new file: t/t4013/diff.diff_master_master^_side
# modified: t/t4128-apply-root.sh
# modified: t/test-lib.sh
#
~
~
quot;.git/COMMIT_EDITMSGquot; 39L, 1454C
238. # This is a combination of 3 commits.
# The first commit's message is:
git apply --directory broken for new files
# This is the 2nd commit message:
git diff <tree>{3,}: do not reverse order of args
# This is the 3rd commit message:
test-lib: fix broken printf
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author: Jeff King <peff@peff.net>
#
# Not currently on any branch.
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: builtin-apply.c
# modified: builtin-diff.c
# modified: t/t4013-diff-various.sh
# new file: t/t4013/diff.diff_master_master^_side
# modified: t/t4128-apply-root.sh
# modified: t/test-lib.sh
#
~
~
quot;.git/COMMIT_EDITMSGquot; 39L, 1454C
267. $ git checkout master
$ ls
README rack_app.rb
$ git checkout rack_branch
$ ls
AUTHORS KNOWN-ISSUES Rakefile contrib lib
COPYING README
bin example test
268. $ git checkout master
$ ls
README rack_app.rb
$ git checkout rack_branch
$ ls
AUTHORS KNOWN-ISSUES Rakefile contrib lib
COPYING README
bin example test
269. $ git checkout master
$ ls
README rack_app.rb
$ git checkout rack_branch
$ ls
AUTHORS KNOWN-ISSUES Rakefile contrib lib
COPYING README
bin example test
270. $ git checkout master
$ ls
README rack_app.rb
$ git checkout rack_branch
$ ls
AUTHORS KNOWN-ISSUES Rakefile contrib lib
COPYING README
bin example test
300. $ git status
# On branch master
# Changed but not updated:
# (use quot;git add <file>...quot; to update what wi
# (use quot;git checkout -- <file>...quot; to discar
#
# modified: ticgit.gemspec
#
no changes added to commit (use quot;git addquot; and/
301. $ git status
# On branch master
# Changed but not updated:
# (use quot;git add <file>...quot; to update what wi
# (use quot;git checkout -- <file>...quot; to discar
#
# modified: ticgit.gemspec
#
no changes added to commit (use quot;git addquot; and/
309. $ git status
# On branch master
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: ticgit.gemspec
#
# Changed but not updated:
# (use quot;git add <file>...quot; to update what will be com
# (use quot;git checkout -- <file>...quot; to discard changes
#
# modified: ticgit.gemspec
#
310. $ git status
# On branch master
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: ticgit.gemspec
#
# Changed but not updated:
# (use quot;git add <file>...quot; to update what will be com
# (use quot;git checkout -- <file>...quot; to discard changes
#
# modified: ticgit.gemspec
#
311. $ git status
# On branch master
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: ticgit.gemspec
#
# Changed but not updated:
# (use quot;git add <file>...quot; to update what will be com
# (use quot;git checkout -- <file>...quot; to discard changes
#
# modified: ticgit.gemspec
#
312. $ git status
# On branch master
# Changes to be committed:
# (use quot;git reset HEAD <file>...quot; to unstage)
#
# modified: ticgit.gemspec
#
# Changed but not updated:
# (use quot;git add <file>...quot; to update what will be com
# (use quot;git checkout -- <file>...quot; to discard changes
#
# modified: ticgit.gemspec
#