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
rebase-interactive: suppress whitespace preceding item count
2014-11-14
Joh
a
n
H
e
rlan
d
t330
1
: mod
e
rniz
e
st
y
le
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
ohan Herland
notes: emp
t
y
n
otes
s
hould be shown by '
g
it log'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
ohan Her
l
a
n
d
builtin/no
t
es: ad
d
--allo
w
-empt
y
, to
a
llow storing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
oha
n
Herland
b
u
i
l
tin/notes: split
creat
e
_note()
t
o clarify add
v
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
builtin/notes:
s
implify early exit code
in
a
dd()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan H
e
rland
builtin
/
n
otes: refactor note
file path
into struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
o
han Herland
builtin
/
note
s
: improve namin
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Jo
h
an Herland
t3301: verify
that 'git notes'
removes em
p
t
y
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Her
l
a
nd
builti
n
/
note
s
: f
i
x
premature failure when
trying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Johan Herland
Git 2
.
0
:
g
i
t
s
vn: Set defau
l
t --prefix='or
i
g
in/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Joh
a
n Herland
no
t
es: d
i
sallow re
u
si
n
g non-blob as a n
o
te object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
J
ohan
H
e
rland
sha1
_
f
ile
.
c:create_tmpfile(): Fix ra
c
e when c
r
eating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
git-svn: Wa
r
n about changin
g
default for --prefix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan He
r
land
Documentati
o
n
/git-svn: Prom
o
te the
us
e
o
f
-
-prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Joha
n
H
er
l
and
sample pre-commit
h
ook:
u
se
--
b
ool w
h
en retrie
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
t3200: Add
test de
m
onst
r
at
i
ng minor reg
r
ession in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
a
n Herl
a
nd
Refer to branch
.
<name>
.
re
m
ote/merg
e
when documenti
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
a
n Herland
t3
2
00:
M
inor fix w
h
e
n preparing
f
or tra
c
ki
n
g failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024: F
i
x &&-chaining and a couple of typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
Her
l
and
Move create_notes_commit() fr
o
m no
t
es
-
merge
.
c i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan Herland
Mov
e
c
opy_note
_
for
_
r
e
write +
friends from
b
uilt
i
n/no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_cop
y
_no
t
es_fo
r
_re
w
rite
(
):
L
et
ca
l
l
e
r
pr
o
vide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han
Herland
glossary: Updat
e
an
d
rephrase t
h
e
d
efinition
o
f a
r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
branch
.
c: Validat
e
tracking branches with
r
efspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2: Don
'
t use --track option
a
gainst "svn-remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t7201
.
24: Add refspe
c
to
k
eep --track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t3200
.
39:
t
racki
n
g s
e
tup
s
hould fail i
f
there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use
r
emote refspecs when DWIMming
tr
a
cking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024:
S
h
ow fail
u
re to us
e
refspec
when
D
WIMming remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Add tests verifyin
g
curren
t
DWIM behavior
o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herlan
d
git sy
m
b
o
lic-ref --de
l
ete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix
fail
u
re to
delete a packed ref th
r
ough
a
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
t
1400-
u
p
d
a
t
e-ref: Add test v
e
rifying b
u
g with sy
m
ref
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
notes-
m
erge: D
o
n
'
t
remove
.
git/NOTES_MERGE_WORKTR
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
r
land
notes-mer
g
e: use opendir/readdir
i
nstead
o
f using read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herlan
d
t3310: illustrate
failure to "notes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
fa
s
t-impo
r
t: Fi
x
incorrect fanout level when modify
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2nd
t
e
stcase e
x
posing
bugs in fast
-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Her
l
and
t9301: Fi
x
testcase
coverin
g
up a bu
g
i
n fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an H
e
rla
n
d
t
5400
:
Fix a co
u
ple
of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
H
e
rland
M
a
r
k di
r
stat er
r
or messages
for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve e
r
r
o
r h
a
ndling when parsing di
r
stat para
m
eters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
N
e
w --
d
i
r
stat=
l
ines
mode
,
d
o
ing dirs
t
at
analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
e
r
l
a
nd
A
llow specifying --di
r
stat cut-off percentage
as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d confi
g
vari
a
ble for
s
pecify
i
n
g
d
efault --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Ref
a
ctor --dirst
a
t p
a
rsing; d
e
pre
c
ate --cumu
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make --di
r
stat=0
out
p
ut directories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
erland
Add several
tes
t
ca
s
e
s
for
-
-
dir
s
tat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han He
r
land
-
-dirstat: In cas
e
of renames, u
s
e t
a
rget filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
Teach --dirstat
not to completely
i
gnore
r
e
arrang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dir
s
tat-
b
y-file: Make it faster and more
c
orrect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
oh
a
n He
r
land
--d
i
rstat: Describe non-obvious differen
c
es
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
a
n Herland
M
a
ke "git notes add"
m
o
r
e u
s
er-friendly w
h
en
t
he
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Her
l
and
lo
g
/
pre
t
t
y-opt
i
o
n
s
:
Document --
[
no-]
n
o
t
e
s and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Her
l
and
branc
h
/c
h
e
ckout -
-
tr
a
ck: E
n
sure t
h
at upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Jo
h
an Herland
push
.
default: Rena
m
e 'tracking' to 'upstream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Provide '
g
it merge --abort' a
s
a synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
cmd_merg
e
(): Par
s
e opt
i
o
n
s b
e
fore check
i
ng M
E
RGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
nd
Provide 'git notes g
e
t-ref' to ea
s
i
l
y
retr
i
eve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herland
git
n
otes mer
g
e:
A
dd testcases for
m
erg
i
ng
notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge: Add anot
h
er auto-resolv
i
ng str
a
tegy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
--
c
ommit should fail if
u
nderlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git not
e
s
merge
:
List conflicting notes in not
e
s merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
git no
t
es merge:
M
anua
l
con
f
li
c
t res
o
lution,
p
art 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge
:
Ma
n
u
al
c
onfl
i
ct resolu
t
ion, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herla
n
d
Documentation: Prelimi
n
ary docs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
t
es me
r
ge: Add
a
utomatic conflict resolve
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge: Handle real, non-con
f
licting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
builtin
/
notes
.
c: Refactor cr
e
ati
o
n
of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git n
o
te
s
mer
g
e: Initial impleme
n
t
a
ti
o
n hand
l
ing t
r
i
vial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
builtin/notes
.
c: Spli
t
notes
r
ef DWIMmery into a separa
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
notes
.
c:
Use two
newlines (instead
of one) w
h
e
n
conc
a
tenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(trivial)
t3
3
0
3
: Indent
with tabs instead of
spa
c
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
notes
.
h
/c: Propagate combin
e
_notes_fn return
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
n
otes
.
h
/
c
:
Allow c
o
mbine_notes func
t
ions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
:
Reorde
r
functions in preparation for n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
h: Make default_notes_ref(
)
avail
a
ble in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
(tr
i
v
i
al) n
o
tes
.
h: M
i
nor d
o
cum
e
ntation fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
c: Hexify SHA1 in die(
)
m
e
ssage
f
rom in
i
t_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an
H
erland
note
s
: Don't create (empty) co
m
mit
w
hen removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herla
n
d
Enable
c
ustom scheme
s
for c
o
lumn colors i
n
t
h
e gra
p
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
M
a
ke
g
rap
h
_next_line() av
a
ila
b
le in the graph
.
h A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revision: Turn off hi
s
to
r
y simplificat
i
on
i
n --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
r
evision: Fix typo in --ancestry-path
error
m
essage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Documentation/r
e
v-list-opt
i
ons
.
t
xt: Explain --an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
ha
n
Her
l
a
n
d
Docu
m
ent
a
tio
n
/rev-lis
t
-options
.
tx
t
: Fi
x
mis
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
d
iff
.
c
:
E
nsure "ind
e
x $from
.
.
$t
o
" line c
o
ntains un
a
mbiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han Herland
builtin-notes: Minor (mostly parse_
o
pti
o
ns-rel
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
oh
a
n
H
erland
subm
o
dule
summa
r
y: Don'
t
barf
when invoked in
an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
bu
i
ltin-no
t
es: Ad
d
"copy
"
subcommand for copyi
n
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
b
u
iltin-notes: Misc
.
refact
o
ring o
f
argc and exit
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add -c/-C options
f
or reu
s
i
n
g notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erl
a
nd
builtin-notes:
Refactor handling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
builtin-n
o
tes: D
e
precate t
h
e -m/-F opt
i
ons
f
or "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
u
ilti
n
-
notes: Add "a
p
pend" subc
o
m
mand for a
p
pendi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
builtin-notes: Add "add" subcommand
f
o
r
add
i
ng
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
builtin-notes: Add
-
-
m
essage/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n He
r
land
buil
t
in
-
notes: Add "list
"
sub
c
ommand f
o
r listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Documentation
:
Gene
r
alize git-
n
o
tes do
c
s to 'obje
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Add "prun
e
" subcomman
d
for
r
e
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next