repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t5400: Fix a couple of typos
2011-05-13
Joha
n
Herland
t5400: Fi
x
a
c
o
u
ple of
t
y
p
o
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan
Herl
a
nd
--dirsta
t
: In case of renames, use target f
i
lename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erla
n
d
Teach --dirs
t
at
not to comp
l
e
t
e
ly ignore r
e
arra
n
ged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
er
l
and
--dirstat-
b
y-
f
il
e
: Mak
e
it faster and more corr
e
ct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an H
e
rla
n
d
-
-dirs
t
at:
D
escribe non-obvious differ
e
nces relativ
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Her
l
a
n
d
branch/c
h
e
c
kout --track: Ensure that upstrea
m
branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n H
e
rl
a
nd
push
.
defa
u
lt: Rename 'track
i
ng' to '
u
p
s
tream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
Provide
'gi
t
me
r
ge --abor
t
' as a
s
ynonym
t
o 'git
reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
lan
d
cm
d
_merge(): Parse
o
ptions b
e
f
ore ch
e
cking MERG
E
_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
n
d
P
r
ovide 'g
i
t notes get-ref' to easil
y
retrieve c
u
rr
e
nt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Ad
d
testcases for
m
erging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge:
A
dd an
o
the
r
auto-
r
esolving
s
trategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s merge: -
-
c
ommit
s
hould fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n He
r
land
g
it notes
merge: Lis
t
conflict
i
ng notes in note
s
m
erge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes m
e
rge: M
a
nu
a
l c
o
n
f
l
ict resolution
,
part
2
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
l
and
gi
t
notes merge: Manual co
n
flic
t
resolution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docume
n
t
ation: Pr
e
liminary docs on 'git no
t
es merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
gi
t
notes mer
g
e
:
A
dd automatic confl
i
ct r
e
s
o
lve
r
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
merge: Handle real, non
-
con
f
licting
no
t
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
H
e
rland
b
u
iltin/
n
otes
.
c: Refactor creation of notes com
m
its
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
g
i
t notes merge: Initial imple
m
enta
t
ion
handl
i
ng trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
buil
t
in/notes
.
c: Split notes ref DW
I
Mmery in
t
o
a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
note
s
.
c
: U
s
e two ne
w
lines (inst
e
ad o
f
on
e
) when concat
e
n
a
tin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
(
tr
i
vial
)
t3303: Indent with
ta
b
s
instea
d
o
f
spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
note
s
.
h/c: Propagate combine_notes_
f
n
return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
h
/c: Allow co
m
bine_n
o
tes
f
u
nct
i
ons
to
r
emove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herl
a
nd
notes
.
c:
R
eo
r
de
r
functi
o
n
s in prepar
a
ti
o
n for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
notes
.
h:
Ma
k
e default_notes_re
f
() available
in notes A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
(t
r
ivi
a
l)
notes
.
h: Minor do
c
um
e
n
tation
fixes to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c:
Hexify SHA1 in die() message
f
rom init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
J
oha
n
Herland
note
s
: Don't create
(
empty
)
commit when removin
g
n
o
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable c
u
stom schemes for colum
n
col
o
rs
i
n the g
r
a
ph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
M
ake graph_next_line() a
v
ailable i
n
th
e
graph
.
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
revision: Tur
n
off history simplifi
c
ation
i
n --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
r
l
a
n
d
revisi
o
n:
F
ix typo in -
-
a
n
cestry-p
a
th e
r
ror m
e
ss
a
ge
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docum
e
n
t
a
tion/rev-li
s
t-options
.
txt: Explain --an
c
estry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
rland
Documentation/rev-list-
o
p
t
ions
.
txt:
F
ix missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan
H
erland
diff
.
c:
E
n
sure "index $f
r
o
m
.
.
$to" l
i
ne
contains una
m
bigu
o
us
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builti
n
-notes: M
i
nor (mostly parse_options-
r
elated
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
sub
m
odule
summary: Don't
barf when
invoked in an emp
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erl
a
nd
builtin-note
s
:
Ad
d
"
c
o
p
y
"
s
u
bco
m
mand
for copying no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
buil
t
in-notes: Misc
.
refactor
i
n
g
of
a
rgc a
n
d exit
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builtin
-
notes
:
Add -c/-C optio
n
s for
reusing no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-n
o
t
es: Refactor ha
n
dling of -
F
opt
i
on to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
builtin-notes
:
Depreca
t
e the -m/-F options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes: Add "appe
n
d" sub
c
o
m
mand for app
e
nding
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
b
uilti
n
-
n
otes: Add "add"
s
u
b
command for a
d
din
g
n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
b
uiltin-no
t
e
s
: Add --message/--file
a
l
i
as
e
s for
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
b
u
i
l
tin-no
t
es: Add "list" su
b
comman
d
for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rl
a
nd
D
ocume
n
tation: Gen
e
ralize git-notes docs t
o
'
obj
e
c
ts
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
builtin-notes: Add "prune" subcomm
a
nd for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API
:
prune_note
s
(): Prune notes that be
l
ong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t33
0
5: Verify t
h
at removing notes
triggers automati
c
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
and
builtin-n
o
t
es:
Add "remov
e
" su
b
command for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Teac
h
builtin-notes
to remov
e
empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Teach
not
e
s code to prop
e
rly preserve
n
on-
n
ote
s
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t
3
305: Verify that a
d
ding man
y
notes with git-note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
01
:
V
erify successful annot
a
tion of non-c
o
mmits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
B
u
ilti
n
-if
y
git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Refactor
n
o
tes concatenation into a
f
l
exi
b
le interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
N
otes API: Allow multiple concurrent notes tr
e
es
with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
No
t
es API: write_
n
otes_tree(): Store the
not
e
s tre
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
No
t
es
A
PI: for_eac
h
_note(): Tra
v
erse
the
entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
Notes API: get_note(): Re
t
u
rn the note annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: remove_
n
ote(
)
: R
e
m
o
ve note objec
t
s
from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
Notes
A
PI: add_
n
ote(): Add note objects to the
internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API:
init_notes(): Initi
a
lize the note
s
tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Add test
s
for checking correct handling
o
f $GIT_NOT
E
S_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: get_commit_not
e
s
(
) -> format_
n
o
t
e() +
remov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Minor cosmetic fixes to note
s
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan He
r
l
a
nd
b
u
i
l
tin-c
o
n
f
ig: Fi
x
cr
a
sh when using "-f <r
e
lative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herlan
d
Add more
test
c
ases to te
s
t fa
s
t-
i
m
p
ort of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9
3
01 to t9350, to mak
e
roo
m
for more fa
s
t
-
i
mport
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
r
l
a
n
d
fast-
i
m
p
ort: Pr
o
p
e
r notes tree m
a
ni
p
ulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Jo
h
an Herlan
d
Fi
x
crasher on enc
o
unt
e
ring SHA1-like non-not
e
in no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic bui
l
d in
f
rastruc
t
ur
e
for
P
y
t
h
on scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
oha
n
Herl
a
n
d
A
d
d selfte
s
ts verifying
c
onc
a
tenation of multiple note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan He
r
land
Refactor notes code to concatenate multiple
n
otes ann
o
t
ating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
He
r
land
Add
self
t
e
sts
verifying
t
hat we can pars
e
notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herlan
d
Tea
c
h the notes
l
ookup code to parse no
t
es trees wit
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
H
erlan
d
Teach n
o
tes c
o
de
t
o
f
r
e
e
its int
e
r
nal
d
ata structure
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Her
l
and
A
d
d flags to get_commit_notes
(
) to cont
r
ol the fo
r
mat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
t3302-n
o
tes-ind
e
x-ex
p
e
nsive: Speed up c
r
eate
_
repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
fast-import
:
Add sup
p
ort fo
r
impor
t
i
ng
c
ommit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Teach "-m
<
msg>"
a
nd "-F
<
f
ile>" to "git notes ed
i
t"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clone: Add
-
-
recursive
to a
u
tomatical
l
y checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan H
e
rland
t7
4
07: Use 're
v
-p
a
rs
e
-
-
short' rather than ba
s
h's
s
u
bstri
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule status: Add
-
-
rec
u
rsive t
o
recur
s
e i
n
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git
s
ubmodu
l
e
u
pdate:
I
ntroduce --recursive
to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
git submodule f
o
reach: Add
-
-
r
ecurs
i
ve
t
o recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule forea
c
h
:
te
s
t access to
s
ubmodul
e
name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
Add sel
f
test for '
g
it submodule foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han
H
er
l
a
nd
g
i
t
s
ubmodule: Cle
a
nup usage string and add
option
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Johan
Herland
git s
u
bmo
d
ule foreach:
P
r
o
vide access to s
u
bm
o
dule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Johan Herland
hel
p
.
c: give
c
o
rre
c
t structure's size to memset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Joha
n
Her
l
and
quickf
e
t
ch(): Pre
v
ent
o
ve
r
flow
of
t
he rev-list comma
n
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Jo
h
an
Herla
n
d
git-
s
ubm
o
dule: add s
u
pport
for --merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
Ren
a
me submodu
l
e
.
<name>
.
reb
a
s
e
to
s
ubm
o
dul
e
.
<
name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Jo
h
an Herla
n
d
Up
d
ate docs on beh
a
viour of 'core
.
shared
R
e
p
os
i
tory
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Johan
H
erla
n
d
Mo
v
e
c
hmod(foo, 044
4
) in
t
o move_te
m
p_to_fi
l
e()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next