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
shell: add missing initialization of argv0_path
2011-04-12
Johan
He
r
land
--dirstat:
I
n
case of renames,
use target file
n
ame
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
Teach
--dirs
t
at
not to completely ignore re
a
r
ranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirsta
t
-
by-file: Make it faster
a
nd more
correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herl
a
nd
-
-dirsta
t
: Describe no
n
-
o
bvious differences
r
ela
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
b
ranch/checkout --track: Ensure that upstrea
m
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Jo
h
an Herland
p
ush
.
d
ef
a
ult: Rename 'tracking' to '
u
pstream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herl
a
nd
Pro
v
ide 'gi
t
merge --abo
r
t' as
a
synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herl
a
n
d
cmd_merge():
P
arse opt
i
ons before checking
ME
R
GE
_
HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
l
and
Provide
'
g
i
t
notes get-
r
ef' to easily retrieve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes
merge:
A
d
d
testc
a
s
e
s
f
o
r merging no
t
es trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
Add another auto-resolving str
a
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git not
e
s
merge: --commi
t
should fail if
underlyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
git notes mer
g
e: List
con
f
licting n
o
t
es in
n
o
t
es
m
erge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual conflict resol
u
tion,
p
art 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
git n
o
tes merge
:
Manua
l
c
o
nfli
c
t resoluti
o
n, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
Documentatio
n
: Preliminary docs on 'git n
o
tes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes merge: Add automatic con
f
lict reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes
m
e
r
ge:
Handle real, n
o
n-c
o
nflicting
n
ote
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/not
e
s
.
c: R
e
f
a
ctor creation o
f
notes co
m
mits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
n
otes merge: Initi
a
l im
p
lem
e
nt
a
t
ion
h
and
l
ing trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
bu
i
ltin/note
s
.
c
:
S
plit not
e
s r
e
f DWIMmery into a se
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herl
a
nd
notes
.
c
:
Use two
newli
n
es (instead of one) when conc
a
tenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(t
r
ivial) t
3
303
:
I
n
dent
with t
a
b
s
instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herl
a
nd
n
otes
.
h/c:
P
r
opag
a
t
e combi
n
e_note
s
_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han He
r
land
no
t
e
s
.
h/c
:
A
l
lo
w
co
m
bine_n
o
tes
fu
n
ctio
n
s t
o
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herla
n
d
notes
.
c: Reorder functions in pr
e
paration for
n
ext
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herlan
d
n
o
tes
.
h: Make default
_
n
o
t
es_ref() a
v
aila
b
le in
notes A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
(trivial) note
s
.
h
:
M
i
nor
d
ocumenta
t
ion
fixes t
o
cop
y
_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herland
notes
.
c: Hexif
y
SHA1 i
n
di
e
() message from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
H
e
r
land
notes:
D
on't cr
e
ate (empty) commit when
r
emoving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable c
u
stom schemes for column color
s
in the g
r
ap
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make gr
a
ph_next_line() available in the graph
.
h AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision
:
Turn o
f
f
history simplification i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herlan
d
revis
i
on: Fix t
y
po in --anc
e
stry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
ocumentation/
r
ev-list-
o
ptio
n
s
.
txt: Explain --anc
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docume
n
tati
o
n
/
rev-l
i
st-option
s
.
txt: Fix m
i
ssing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: En
s
u
r
e "index $from
.
.
$
t
o" l
i
ne con
t
ains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herl
a
n
d
builtin-note
s
: Minor
(
mostly parse
_
option
s
-
r
elated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
and
submodule summary: Don't barf when invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin-notes: Add
"
copy
"
subc
o
mmand for co
p
yi
n
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
buil
t
in-notes: M
i
sc
.
refactoring of
a
r
gc
a
n
d
e
xit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-not
e
s
: A
d
d -c/-C op
t
ions
f
or
r
eusing n
o
te
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Refactor hand
l
in
g
of -F option to al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rl
a
n
d
b
ui
l
tin-n
o
tes: Deprecate the -m/-
F
op
t
ions for "g
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
built
i
n-notes:
A
dd "
a
ppend" subcommand for
a
ppen
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
built
i
n-notes
:
Add "add"
s
ubco
m
m
a
nd for
adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-
n
otes:
Add --mess
a
ge/--file al
i
ases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
n
otes: Add
"
list"
subc
o
mmand for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
Documen
t
ation:
Generalize git-notes docs to 'obj
e
cts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-n
o
t
es: Ad
d
"prune" subcom
m
an
d
for
rem
o
vin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Note
s
API:
prune_notes
(
): Prune notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rla
n
d
t3
3
05
:
Verif
y
that removing notes t
r
iggers
a
u
tomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
buil
t
in-notes: Add "rem
o
ve" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Te
a
ch buil
t
in-notes to remo
v
e
e
mpty n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
Teach no
t
es co
d
e to p
r
o
per
l
y preserve
n
o
n
-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
H
e
rland
t330
5
:
V
erify that
a
d
ding
many notes w
i
th g
i
t-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
t3301: Ver
i
fy successful annotati
o
n
of
n
on-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
B
uiltin-ify
g
i
t-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Ref
a
c
t
o
r
notes con
c
atenation
in
t
o a flexible
i
n
t
erface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
Notes
API: Allow multiple concurr
e
nt n
o
tes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: write_n
o
tes_tree(): Store the note
s
tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes AP
I
: f
o
r
_each_
n
ote(): Trave
r
se the entire
n
ote
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
Not
e
s API: get_note(): Return
t
he n
o
te anno
t
ating
t
he
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Notes API:
r
emove_note(): Remove not
e
objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: a
d
d_note()
:
Add note objects to the
i
nternal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes
A
P
I:
i
n
it_notes(
)
: Initialize the notes
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
A
dd
tests for chec
k
ing correct
h
andling o
f
$GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
Notes API: get
_
commit_notes
(
) -> format_note()
+
r
e
mov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmetic fixe
s
to
not
e
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Her
l
a
nd
builtin-con
f
ig: Fix cr
a
sh when using "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an
Herland
Add more test
c
ases to
t
est fas
t
-imp
o
rt of
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herland
Rename t9301 to t9
3
50, to make room f
o
r more fast-i
m
por
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Her
l
an
d
fast-im
p
ort: Prope
r
notes tree
m
a
n
ipul
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
oha
n
Herland
Fix crasher on encoun
t
ering SHA1-like non-note in n
o
te
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan He
r
l
a
nd
B
a
sic build infra
s
tr
u
cture f
o
r Py
t
hon scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Add
sel
f
tests verifying
c
oncatenatio
n
of mu
l
tiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refact
o
r n
o
tes
c
ode to concatenate
mu
l
tip
l
e
notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add
selftests ve
r
ify
i
ng that we can parse n
o
tes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach
th
e
n
o
tes lookup code
to par
s
e
no
t
es tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herla
n
d
T
e
a
c
h
notes code to free
i
ts internal data s
t
r
uct
u
res
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
H
erland
Add flags to get_
c
ommit
_
notes() to co
n
trol the
f
ormat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302
-
notes-index
-
expen
s
ive:
Spee
d
up
c
r
eate_
r
epo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
H
erland
fast-impor
t
: Ad
d
suppor
t
for importing
commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach "-m <msg>" and "-F
<
f
i
le>" to "g
i
t
n
ote
s
edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Jo
h
an He
r
land
git clone:
Add --recursive to automatically check
o
ut
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
o
han
H
erl
a
n
d
t
7407: Use
'
rev-parse --sh
o
rt' rat
h
er than bash's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
and
git submodu
l
e s
t
atus: Add --recursi
v
e to recur
s
e into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submod
u
le upd
a
te: I
n
tr
o
d
uce --recursive to
upd
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
a
n
d
git s
u
bm
o
dule
f
oreach: Add
--r
e
cursive to r
e
curse int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herl
a
nd
git submodule foreach: test access to su
b
module name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
r
land
Add selftest for 'git
s
ubmodule foreac
h
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule: Clea
n
up
u
s
age string and a
d
d option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
J
ohan
H
e
r
la
n
d
git submodule
f
oreach: Provide acc
e
ss
to submodule
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan H
e
rland
help
.
c: give correct
struc
t
u
re's s
i
ze to memset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan
H
erland
quickfetch(): Prevent overflow of
the rev-li
s
t co
m
mand
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
o
han Her
l
and
git-subm
o
dule: add support for
-
-mer
g
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan He
r
land
Rename subm
o
d
ule
.
<
name
>
.
rebas
e
to submodule
.
<
name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Update docs on behaviour of 'core
.
s
haredRepository
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Jo
h
an
H
e
rland
Move chmod(foo, 0444
)
in
t
o move_temp
_
to_
f
i
le
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herl
a
nd
Use strch
r
nul() inst
e
a
d
o
f
strchr()
p
lus manu
a
l workaro
u
nd
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next