repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/strcasecmp-pure-inline'
2013-09-24
Johan Herl
a
nd
sample pre-commi
t
hook: use --bool when retri
e
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: Add
t
es
t
dem
o
nstrating minor regression i
n
41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
ohan Herland
Refer
t
o
b
ranch
.
<name>
.
remo
t
e/me
r
ge whe
n
doc
u
menting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t320
0
: Minor
fix w
h
en p
r
e
paring for tracki
n
g
f
ai
l
ure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an
H
erland
t2
0
24: Fix
&
&-chaining and a co
u
ple
o
f typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
ha
n
Herla
n
d
M
ove c
r
ea
t
e_notes_commit() fro
m
notes
-
m
e
r
ge
.
c
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herland
Move cop
y
_no
t
e_for_rewr
i
te + frien
d
s
f
rom builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_copy_notes_for_rewrit
e
():
Let caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
e
rlan
d
glossary: Upd
a
te and rephrase
the definition of
a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
branch
.
c
:
Vali
d
ate tracking
b
ranches w
i
t
h
r
efspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2: Don't us
e
--tr
a
ck op
t
ion agains
t
"svn
-
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
t7201
.
24: Add refspec to keep --track w
o
rking
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
3
9
:
t
racking set
u
p s
h
ould f
a
i
l
if there
is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herlan
d
ch
e
ckout: Use rem
o
te ref
s
pecs when
D
W
I
Mming trac
k
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
oha
n
Herland
t
2024:
Show failure to use
r
e
fspec when DWIMmi
n
g r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
a
n
Herland
t2024:
A
d
d t
e
sts
v
erifying c
u
rrent
DWIM behavior
o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herland
git symbolic-ref
--d
e
lete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
la
n
d
Fix failure t
o
delete a packed ref throug
h
a s
y
m
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan
H
erland
t1400-update-ref: A
d
d test verifying bug with symr
e
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
a
n
He
r
land
notes-merge: Don
'
t r
e
m
o
ve
.
git/NOTES_MERGE_WORKT
R
EE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
n
otes-merg
e
: use ope
n
dir/readdir instead
of
u
s
i
ng
r
ea
d
_di
r
ec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t33
1
0:
illustrate
failure to "not
e
s merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
fast-import: F
i
x incorrect fa
n
out
l
evel when mo
d
ifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erla
n
d
t930
1
:
A
d
d 2nd te
s
tcas
e
exposing bugs i
n
f
a
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
t9
3
01: Fix
testcase cove
r
ing up a bug in fast-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan
H
erland
t5400
:
Fix a
c
ouple of
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ma
r
k d
i
rs
t
a
t error me
s
sa
g
es for t
r
anslation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Improve error han
d
l
i
ng when pars
i
ng dirstat paramete
r
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rl
a
nd
New --d
i
rstat=lines mode, doin
g
dirs
t
at analys
i
s based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allo
w
specify
i
ng --dirs
t
at
cut-o
f
f
percentag
e
as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add c
o
nfig variab
l
e
f
or specif
y
ing def
a
ult --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Refacto
r
--dirstat parsing; d
e
prec
a
te --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Mak
e
--dirstat=0 output director
i
es that contribu
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herla
n
d
Add
s
e
veral
testc
a
se
s
for --dirs
t
a
t
a
nd friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan H
e
rland
-
-dirs
t
at: In case of renames, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
Teac
h
--
d
irstat not to completely ignore
r
earranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han
H
erland
--dirstat-by-file:
Make
it
f
aster and more corre
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Her
l
a
nd
--dirstat:
Describe non-obvi
o
us
differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herl
a
nd
Make "git n
o
tes
a
d
d" mo
r
e user-
f
r
ie
n
dly whe
n
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
ha
n
H
e
rland
log/pretty-options
:
Document --[n
o
-]note
s
and depr
e
ca
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n Herla
n
d
branch/checkout --tr
a
ck: Ensure that upstream br
a
nch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
o
h
an
Herla
n
d
p
u
s
h
.
d
e
faul
t
: Rename
'
t
r
a
cking' to 'upstrea
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'g
i
t
m
erge --ab
o
rt' as a synonym to
'git r
e
s
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cm
d
_merge(): Parse o
p
tions before
c
h
e
cking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Provide
'
git notes get-ref' to easily
r
e
t
r
iev
e
c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
n
d
git notes merge: Ad
d
testcases for
merging notes t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es
merge:
A
dd an
o
ther
a
u
to-re
s
olvi
n
g
s
tr
a
tegy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes mer
g
e: --commit sho
u
ld fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
mer
g
e:
L
is
t
conflicting not
e
s in notes mer
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
git notes m
e
rge: Man
u
al conf
l
ict
r
e
s
olution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
gi
t
notes merge: Manual con
f
lict
r
esolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documen
t
ation: Preliminary docs o
n
'git n
o
tes m
e
rge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: A
d
d automatic
conflic
t
r
e
s
o
lvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git n
o
tes merg
e
: Handle real, non
-
c
o
nflicting
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
builtin/notes
.
c: Refactor cr
e
ation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
git note
s
m
e
rge: Init
i
al impl
e
mentation h
a
ndling
t
riv
i
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herlan
d
buil
t
i
n/notes
.
c: Split notes
r
e
f DW
I
M
mery into a
s
eparate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
notes
.
c
: U
s
e
t
wo newlines (instead of one) when concatenat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
(t
r
i
v
i
a
l) t3
3
03
:
I
ndent with tabs inste
a
d
o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
h/
c
: Prop
a
gate com
b
ine_
n
otes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h
/c: Allow combine_not
e
s fu
n
ctions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c:
R
eorde
r
functions in preparat
i
on for
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rl
a
nd
n
o
tes
.
h: Ma
k
e def
a
ult_notes_re
f
()
availabl
e
i
n
note
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
(trivi
a
l) notes
.
h: Minor
d
ocum
e
ntation fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
c: Hexify
S
HA1
i
n
d
ie(
)
message f
r
om init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
Herland
notes:
Don
'
t crea
t
e (empty) commit w
h
e
n remo
v
i
ng
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable c
u
s
t
om scheme
s
f
o
r
col
u
mn color
s
in the gra
p
h A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
M
a
ke
g
raph
_
next_li
n
e
(
) a
v
ailabl
e
i
n
the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
re
v
ision: Tur
n
off history simplific
a
t
ion in
--ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
r
e
v
is
i
o
n
: Fix ty
p
o
in
-
-ancestry-path e
r
ror me
s
sage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Document
a
tion/re
v
-l
i
s
t-options
.
txt:
E
xplain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herl
a
nd
Document
a
tion/rev-list-options
.
t
xt: Fix mi
s
si
n
g line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n
H
erl
a
nd
d
iff
.
c: En
s
ur
e
"index $from
.
.
$
to" lin
e
contains unam
b
iguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
buil
t
in-notes: Mi
n
or (
m
ostly parse_
o
ptions-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan H
e
rla
n
d
s
ubmod
u
le
summ
a
ry: Don't barf w
h
en
i
nvoked
in a
n
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes:
A
d
d "c
o
py" subcommand
f
or copyi
n
g
n
o
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
bu
i
ltin-notes: Mi
s
c
.
refactoring of argc a
n
d exi
t
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
bu
i
ltin-no
t
es: Add -c/-C
options f
o
r
reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: Ref
a
ctor
h
andli
n
g of -F opt
i
o
n to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herlan
d
builtin-not
e
s: Deprecate the -m/-F options
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
bui
l
t
in-note
s
: Add
"
append" subcommand for append
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-n
o
tes:
Ad
d
"
a
dd" subco
m
mand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add --message/--file aliases for
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
bu
i
ltin-notes: Add "list
"
subcommand f
o
r listing
no
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
D
ocumentation: Gen
e
ral
i
z
e git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-n
o
tes: Add "prune" s
u
bcomma
n
d fo
r
rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Note
s
API: p
r
une_notes():
Pr
u
ne notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
t330
5
: Verify that removi
n
g not
e
s
triggers aut
o
matic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
built
i
n-notes
:
Add "r
e
m
o
ve"
subcommand fo
r
r
emoving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach bu
i
ltin-notes to remove e
m
pty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
T
eac
h
notes code to pro
p
erly pr
e
serve
n
on-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t33
0
5
: Verify tha
t
adding many note
s
w
i
th git
-
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
t33
0
1
: Ve
r
ify
successful annotation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Buil
t
in-if
y
g
i
t
-
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refac
t
or n
o
tes
c
o
n
ca
t
enat
i
on into a flexible
i
nterface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
Notes A
P
I: Allow multiple concur
r
ent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: write_notes
_
t
r
ee(): Sto
r
e
the n
o
tes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes API: for_ea
c
h_note(
)
:
T
raverse the
entire no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rl
a
n
d
Notes API:
get_not
e
(
)
:
Return the note annotatin
g
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
No
t
es API:
r
emove_note(): Remove note o
b
jects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next