repo.or.cz
/
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 'maint'
2013-09-24
Johan Her
l
and
sa
m
ple pre-
c
o
mmi
t
hook
:
use
-
-bool wh
e
n retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rland
t3200: Add test
demonstrati
n
g minor regression
i
n 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
ha
n
Herland
Ref
e
r to
br
a
nch
.
<name>
.
remote/m
e
rg
e
when documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
a
n
H
e
r
land
t3200: Minor fix when p
r
epa
r
ing
for trac
k
ing fa
i
l
u
r
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rla
n
d
t
2
024:
Fix &&
-
chaining
a
nd a couple of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
H
erland
Move create_not
e
s_comm
i
t() from note
s
-
merge
.
c
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
Move copy_not
e
_for_rewrite
+
friends from builtin/
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herla
n
d
finish_copy_notes_
f
o
r_r
e
write():
L
et caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
glossa
r
y:
Update
an
d
rephrase th
e
def
i
ni
t
ion of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
branch
.
c: Validate tracking br
a
nches with
r
ef
s
pecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t9114
.
2: Don't
use --track opt
i
o
n against "
s
vn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t7201
.
2
4: Add r
e
fsp
e
c
to keep --track worki
n
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
H
erl
a
nd
t
3
2
00
.
39: tracking setup should fail
i
f there
is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use remote ref
s
pecs
w
h
e
n DWIMming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t2024:
S
h
ow failure to us
e
refspec when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t2024:
A
dd tests ver
i
f
ying current DWIM behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
git symboli
c
-ref --delete
$
symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herland
Fix
f
ailur
e
to dele
t
e a packed ref thr
o
ugh a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Her
l
and
t1400-u
p
d
ate-ref: Add test v
e
rifying b
u
g with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n He
r
land
notes
-
merge: Don't remo
v
e
.
git/NOTES_MERGE_
W
ORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n Herland
notes-merge:
use opend
i
r/readdir instead
of
u
sing
read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t
3310: illustr
a
te
fail
u
re t
o
"note
s
m
e
rge -
-
comm
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
fast-import
:
Fix inco
r
rect
f
anout level
when
m
o
difying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t9301: Add
2
nd testcase exposin
g
bugs in fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
t
9
301: Fix test
c
ase
c
ove
r
i
ng u
p
a
bug in
f
ast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
erland
t
5
400: Fix a couple of typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Mark dir
s
tat error mes
s
ages for
translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
I
mprove error handling when parsing
d
irstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dirstat=lines mode, d
o
ing dir
s
tat
a
n
alysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Allow specifying --dirstat
cut-off percentag
e
as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
He
r
land
Add config va
r
iable for spec
i
fying
d
efault --dirs
t
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
H
erland
R
e
fact
o
r
-
-d
i
rstat parsing; de
p
recate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Make --dirsta
t
=0 outp
u
t directories
t
h
a
t
c
o
n
tribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Add sev
e
ral te
s
tcases for --dirsta
t
a
nd
f
rien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herlan
d
--dirst
a
t: In case of
renames, use target fi
l
ena
m
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Her
l
and
Te
a
ch --d
i
rstat
n
ot to completely
i
gn
o
re rea
r
ranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by
-
file: Make
i
t fa
s
ter and more corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n He
r
land
--d
i
rsta
t
:
Describe non-obvi
o
us differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Herland
Make "git notes add
"
more use
r
-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herlan
d
log/pretty-options: Document --[no-]no
t
es a
n
d deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
H
e
rland
branch/
c
heckout --tr
a
c
k:
E
nsure that ups
t
ream bra
n
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
erland
push
.
default: Rename 'tracking' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Prov
i
de '
g
it merge --abort' as a synonym to 'git
re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
H
e
rland
cm
d
_merge
(
): Parse options before ch
e
ckin
g
MERGE_H
E
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
Provide 'git note
s
g
e
t
-ref' to easily
r
etrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
i
t notes
m
erg
e
:
A
d
d
testcases
f
or
merging notes t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
git
notes merg
e
: Add another auto-resolving
s
trategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git
n
otes merge
:
--commit should fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
git notes merge: List conflict
i
ng notes
in n
o
tes
me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
git notes me
r
ge: Man
u
a
l conflict
r
es
o
l
utio
n
, par
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
git notes merge: Man
u
al
conflict resolution, p
a
rt 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
Herland
Documentation: Prelimina
r
y docs on 'git notes merge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Add automatic conflict reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
gi
t
n
otes merge: Handle
real, non-
c
o
n
f
l
i
cting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
builtin/notes
.
c: Refacto
r
cr
e
a
t
i
on of notes
c
o
mmits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes
m
erge: Initia
l
implementa
t
ion handling t
r
ivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
builtin/
n
otes
.
c
: Split notes
r
e
f DWI
M
me
r
y into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
note
s
.
c
: Use two newlines (instead o
f
one) wh
e
n conca
t
enatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(triv
i
al) 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
Johan H
e
rland
n
o
t
es
.
h/c:
Propagate combine_note
s
_fn retur
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
e
rlan
d
no
t
es
.
h/c: Allo
w
comb
i
ne_not
e
s functions t
o
re
m
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
: Reorder functions in preparation for nex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h
:
Make default_notes_
r
ef
(
) ava
i
lable in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) no
t
es
.
h: Minor documen
t
ation fixes t
o
copy_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
H
erland
notes
.
c
:
Hexify SHA1
i
n d
i
e() m
e
ssage from i
n
i
t_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan H
e
r
l
and
note
s
:
D
on't create (emp
t
y) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herla
n
d
Enable
c
ustom sch
e
me
s
f
o
r
c
olumn colors in the gra
p
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make gra
p
h_n
e
xt
_
line() avai
l
able in the gr
a
ph
.
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
revi
s
ion: Turn
off history
s
impl
i
fica
t
ion
in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
r
l
a
nd
revi
s
ion: Fix t
y
po in
-
-
ancestry-path e
r
ror message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herla
n
d
Doc
u
mentat
i
on
/
rev-list-options
.
txt: Explain
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Her
l
and
Doc
u
m
entation/r
e
v-list-opti
o
ns
.
txt:
F
ix mis
s
i
ng line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n Herland
d
i
ff
.
c
:
Ensure "in
d
ex $
f
rom
.
.
$to" line c
o
n
t
ains una
m
biguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
e
r
land
builtin-
n
otes
:
Min
o
r
(mostly p
a
rse
_
op
t
ions-re
l
at
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herl
a
n
d
su
b
module
s
u
m
mary: Don't
b
a
r
f whe
n
i
n
voked in a
n
e
mp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
e
rland
builtin-
n
otes: Add "copy" subcommand
for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
builtin-notes: Misc
.
refactori
n
g
of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
builtin
-
notes:
A
dd -c/-C o
p
tions for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilt
i
n-notes: Refac
t
or handling of -F op
t
ion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
bui
l
t
in-notes: Depre
c
ate the -m/
-
F options for "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
bui
l
tin
-
notes
:
Add "append"
s
u
bcom
m
an
d
f
o
r appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
bu
i
ltin-notes: Add "add"
subcomman
d
for addi
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
bu
i
l
t
i
n
-not
e
s: Add
-
-
messa
g
e/--file alia
s
e
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes:
A
dd "list"
s
u
bcommand for list
i
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
D
o
cumentation: G
e
ner
a
l
i
ze gi
t
-notes docs to 'ob
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-note
s
: Add "prune" s
u
b
c
om
m
and for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Notes API: pru
n
e_note
s
()
:
Prune notes that bel
o
n
g to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3305:
V
e
r
ify that removing notes
t
riggers autom
a
t
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
builtin-notes:
A
dd "re
m
o
v
e"
subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Tea
c
h builtin-
n
o
t
es to r
e
move
e
m
p
ty
n
o
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
notes code to properly pre
s
erve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Her
l
and
t330
5
:
V
e
rify that addi
n
g many notes wi
t
h g
i
t
-
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify s
u
cce
s
sfu
l
a
n
no
t
ation of non
-
commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
Buil
t
in-i
f
y git-not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Refactor notes concatenation into a
f
lexible i
n
terfac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Note
s
API: Allow multi
p
le concurr
e
nt notes
t
rees wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API:
writ
e
_
no
t
es_tree(): Store
t
he notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes
API: f
o
r_each_not
e
(): T
r
averse
t
he entir
e
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
N
o
tes A
P
I: g
e
t_
n
ote()
:
Return t
h
e note annotating
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: rem
o
v
e
_note(): Remo
v
e n
o
t
e
objec
t
s from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next