repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/unpack-entry-optim-in-pack-objects'
2013-09-24
Johan Herla
n
d
sample pre-commit hook: use
-
-bool wh
e
n retrievin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
land
t3200: Add te
s
t d
e
monstrati
n
g minor regression i
n
4
1c2
1
f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
n
d
R
efer
t
o branch
.
<name>
.
rem
o
te/merge when
documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t
3200
:
Minor fix w
h
en prepar
i
ng for tra
c
k
i
ng fai
l
ur
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an
Herland
t2
0
2
4
: Fix &&-chain
i
ng and
a
couple
of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herland
Move
create_notes_commit() from notes-merge
.
c
i
n
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan H
e
rland
M
o
ve
c
opy_note_f
o
r
_rewrite
+
friends from bu
i
lti
n
/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
fin
i
sh_cop
y
_
notes_
f
or_rewrite(): Let caller provi
d
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
g
loss
a
ry:
U
pdate
a
nd rephrase
the definiti
o
n of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
bran
c
h
.
c: Valida
t
e tracking bra
n
ch
e
s with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t9114
.
2: Don't use
-
-track option against "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t7201
.
24: Add ref
s
pec
t
o keep --track
w
orking
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t3200
.
39: trac
k
ing setup shoul
d
fai
l
if there is
n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Her
l
and
c
hecko
u
t:
U
se
r
emote re
f
s
p
ecs
w
hen DWIM
m
ing tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han He
r
land
t20
2
4: Show
f
ailure
t
o
use ref
s
p
ec
when DWIMming r
e
m
o
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Add tests verifyin
g
curre
n
t DWIM behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herlan
d
git
s
ymbolic-r
e
f --del
e
te $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
Fix failure
t
o
d
e
lete a packed
ref
t
hrough a sy
m
r
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herla
n
d
t1400-update-ref: Add
t
est verifying bug
w
i
t
h symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han
H
erlan
d
note
s
-merge: Don't remove
.
g
it/NOTE
S
_
M
ERG
E
_WORKTR
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-mer
g
e
:
use opendir/readdir inste
a
d
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
t3310:
i
l
lustrate
f
a
ilure to "notes merge --
c
ommit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-im
p
ort: Fix i
n
c
orrect fanou
t
level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
ha
n
H
erland
t9301: Add 2nd testca
s
e exposing bugs
i
n fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9
3
01: Fix testcase covering u
p
a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
erland
t5400: Fix a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
M
ark dirsta
t
error messages fo
r
translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Im
p
rove error
han
d
lin
g
when parsi
n
g d
i
rstat pa
r
ameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New
-
-dirstat=
l
ines mode, doing di
r
stat analy
s
is
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow
s
pec
i
fying
-
-
dirstat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
ha
n
H
erland
Add co
n
fig
varia
b
le for specify
i
n
g
defau
l
t --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor
-
-dirstat
p
a
r
sing;
d
e
p
rec
a
te --
c
um
u
lati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make --dirstat=0 outp
u
t directori
e
s th
a
t
c
ontribut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several t
e
stca
s
es for --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
ha
n
Herland
--dirsta
t
: In case o
f
ren
a
mes, us
e
target
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
T
e
a
ch
--dirstat n
o
t to
c
ompl
e
t
e
ly ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--dir
s
tat
-
by
-
file: Make it
fa
s
ter and m
o
re c
o
rrect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
-
-
d
i
rs
t
a
t
: De
s
cribe non-obvious
differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Herland
Make "git notes
add" more use
r
-frien
d
ly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Herland
log/pretty-optio
n
s: Document --[no-]notes
a
n
d
d
e
precate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/check
o
ut --
t
rack
:
Ensure that up
s
t
rea
m
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Rename
'tracking' to
'
upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
r
o
vide 'git me
r
ge --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 Herlan
d
cmd_mer
g
e(): P
a
rse opti
o
ns befor
e
c
hecking
M
ERGE_HE
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Pro
v
id
e
'git notes
g
e
t-ref' to easily retrieve
c
urrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rland
git
note
s
m
e
rg
e
: Add te
s
tcas
e
s for merging note
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it n
o
tes merge: Add another auto-
r
esolv
i
ng strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
nd
git no
t
es
merge: --commit
s
hould fail if unde
r
lyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge: List c
o
nflicting notes in notes
m
er
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
git
n
otes
merge:
M
anual con
f
lic
t
resolut
i
on
,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
la
n
d
git note
s
merge: Manua
l
co
n
flict resolution, par
t
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
D
ocumentation: Preliminary docs on
'
git
note
s
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
l
and
g
it note
s
merge:
A
d
d
automatic conf
l
ict
r
esolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
git notes merge
:
H
andle real
,
no
n
-conflictin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
builtin/notes
.
c
:
Refactor creation
o
f
note
s
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
git notes m
e
rge: I
n
i
t
ia
l
i
m
plementa
t
ion handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
b
ui
l
tin/no
t
es
.
c: Spl
i
t notes ref
DWIMmery i
n
to a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
no
t
e
s
.
c: Use two
n
e
wlin
e
s (instead of one) when concate
n
atin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
(
trivial) t33
0
3: Indent
wit
h
tabs inst
e
ad of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
notes
.
h/c
:
Propagate c
o
mbine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
e
rland
notes
.
h/
c
: Allow
c
ombine_notes functions to
re
m
ove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
c
:
Reorder functions
i
n preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
:
Ma
k
e def
a
ult_notes_ref() avail
a
ble in notes
A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tri
v
ial) notes
.
h: Min
o
r
docume
n
tation fixes to copy_
n
otes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c
:
Hexify SHA1 in die(
)
message
f
r
o
m init
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
n
otes: Don't create (emp
t
y
) commit
w
he
n
removing no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
Ena
b
le c
u
stom scheme
s
for colu
m
n
colors in
t
he graph AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n He
r
l
and
Mak
e
g
r
aph_next_
l
ine() avai
l
a
bl
e
in the grap
h
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
oha
n
He
r
l
a
nd
revision: Turn off history simplification
i
n --ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typo
in --a
n
cestry-path error me
s
sage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
D
ocumenta
t
ion/r
e
v
-
list
-
opt
i
ons
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herlan
d
Documentation/rev-list-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n Herland
diff
.
c
: Ensure
"
index $from
.
.
$to" line contains
una
m
biguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-notes
:
Mino
r
(mostly p
a
rse_op
t
ion
s
-
r
elated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule sum
m
ary: Don't b
a
rf when i
n
voked in a
n
e
m
pty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
He
r
land
builtin-
n
o
t
es: Add "
c
opy" su
b
comma
n
d
f
or
copying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
builtin-not
e
s: Misc
.
r
e
fact
o
ring
of argc and ex
i
t value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
uiltin-notes: Add
-
c
/
-C opti
o
ns
f
or r
e
using no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
a
nd
built
i
n-notes: Refacto
r
ha
n
dli
n
g of -F
option to
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
builtin-notes:
Deprecate the -m/-F options for "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
n
d
built
i
n-
n
otes: Add "append" subcomman
d
for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Add "add
"
subcomma
n
d for a
d
ding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
buil
t
in-n
o
t
es
:
Add --messa
g
e/--file
a
l
i
ases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes: Add "list" subcommand for listing
n
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
Documentation: Gen
e
ral
i
ze git-notes docs
t
o 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
builtin-no
t
es: Add "pru
n
e" subco
m
mand for remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
e
rland
Note
s
A
P
I: prune_notes():
P
ru
n
e n
o
tes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
t3305: Verify
t
hat rem
o
v
i
n
g
notes
t
riggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add "remo
v
e"
subcomm
a
nd for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Teach builtin-notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Teach
n
otes code to proper
l
y p
r
eserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
t3305: Verify tha
t
adding many not
e
s wit
h
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
t3
3
0
1
: Verify successful annotation of non-commi
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Builtin-
i
fy
g
it-no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Refactor notes conca
t
e
nation into a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
N
otes API:
A
llow multiple concurrent notes tre
e
s wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
n
d
Notes API: wr
i
te_notes_tre
e
():
S
tor
e
the notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: fo
r
_e
a
ch_note(): Traver
s
e the entire no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
P
I: get_not
e
(): R
e
turn the
n
ote
annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes API:
r
e
move_no
t
e(): Rem
o
ve note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next