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
branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
2013-04-21
Johan
H
erlan
d
branch
.
c: Validat
e
t
racking branches
w
i
t
h
r
efspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
lan
d
t9114
.
2: Don't use --track op
t
i
on against "svn-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t720
1
.
24: Add refspec to keep --track wo
r
k
i
n
g
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t3
2
0
0
.
39: tracki
n
g
s
e
t
u
p should f
a
il if
t
here
is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
che
c
k
o
u
t
: Use remote refspecs
w
h
en DWIM
m
i
ng tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herl
a
nd
t2024
:
S
how failure to use refspec when DWIMming
r
emote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
t
2
024: Add te
s
ts verifyi
n
g cu
r
r
e
nt DWIM b
e
havior
o
f
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herla
n
d
gi
t
sy
m
bolic-ref --delete $sy
m
r
e
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix failur
e
to delete a packed
ref through a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t
1
400-update-ref: Add test
v
erifyin
g
bug with
s
y
mrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an
H
erl
a
n
d
notes-
m
erge: Don
'
t remove
.
g
it/N
O
TES_MERG
E
_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herl
a
nd
notes-m
e
rge: use opendir/readdir
i
nstead of
u
s
i
ng read_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an
H
erl
a
nd
t3310: illustra
t
e failu
r
e
to "note
s
merge --co
m
mit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
r
l
a
n
d
f
ast-import
:
Fi
x
incorrec
t
fanout level
w
h
en modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2nd t
e
stcase expos
i
ng bugs in f
a
st-imp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
t9301: F
i
x test
c
ase c
o
ver
i
ng up a bug in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an
Herl
a
n
d
t5400:
F
ix a cou
p
le of
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Mark dirs
t
at
error messages for tran
s
lation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Improve error handling wh
e
n
p
arsing di
r
s
tat param
e
te
r
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
nd
New --dir
s
t
a
t=lines mode,
d
oing
dir
s
tat anal
y
sis base
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
l
low speci
f
ying --dirstat c
u
t-of
f
percenta
g
e as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Add confi
g
va
r
iab
l
e
f
or specifying defa
u
lt --dir
s
tat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an H
e
rland
Refactor --dirstat
parsing; dep
r
ecate --cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han H
e
rland
Make --dir
s
tat
=
0 out
p
ut
directories t
h
at contribut
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ad
d
several testca
s
e
s
f
o
r --dirstat and friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirs
t
at:
In case of
r
enames, use target filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herla
n
d
Teach --
d
irstat not to completely ignore rearra
n
ged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--di
r
stat-by-file: Make
it fas
t
er
and more
c
orr
e
ct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan He
r
land
--
d
irstat: Desc
r
ibe non-obvious
d
i
ffe
r
ences rela
t
i
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Her
l
and
M
a
ke
"git notes a
d
d"
mor
e
use
r
-fri
e
ndly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herland
log/pret
t
y-
o
p
t
ions: Document --[no-]
n
otes
a
n
d
deprec
a
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
bra
n
ch/checkout
--track: Ensure that ups
t
ream
b
r
anch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n He
r
l
a
nd
pu
s
h
.
d
e
f
ault: Rename 'tr
a
cking' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
Provide 'git merge -
-
abort' as a synonym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
cmd_merge()
:
Par
s
e options before checking MERGE_H
E
AD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
P
rovide 'git notes get-ref' to eas
i
ly r
e
trieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes m
e
rg
e
: Add testcases for
m
e
r
ging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
e
r
land
git
no
t
es merge: Add another aut
o
-r
e
solving str
a
tegy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
l
a
n
d
git notes me
r
ge: --co
m
mi
t
s
ho
u
ld fai
l
if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
git notes merge: List conflicting notes in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes
merge
:
Manual c
o
nflict resolution, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge: Manual
conflict re
s
olution,
p
art
1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
Documentation:
Prelim
i
nar
y
docs o
n
'
git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
not
e
s
m
e
rge: Ad
d
automa
t
i
c
conflict
r
esolve
r
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes mer
g
e:
H
a
n
dle re
a
l, n
o
n
-
conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/no
t
es
.
c: Refactor creation of notes c
o
m
mits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
git
notes merge
:
Initial implementation
h
a
n
d
lin
g
trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
builtin/
n
ote
s
.
c: Spli
t
no
t
e
s
r
ef DWIMm
e
r
y into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
es
.
c: U
s
e two newlines (inst
e
ad
o
f one)
w
h
e
n
c
oncaten
a
ti
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
(tr
i
vial)
t3303: Indent with ta
b
s instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Her
l
and
note
s
.
h/c: Propaga
t
e combine
_
notes_fn retu
r
n
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
not
e
s
.
h/c: Allow combine_notes functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
n
o
tes
.
c
: Reorde
r
functions
in preparation
f
or next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
not
e
s
.
h: M
a
ke default_not
e
s
_r
e
f() avai
l
able
in not
e
s API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herland
(trivial) notes
.
h: M
i
n
o
r docu
m
e
n
t
at
i
on fixes to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexif
y
SHA1 in die()
messa
g
e from
i
nit_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herlan
d
notes: Don't
c
r
e
a
t
e
(emp
t
y) commit w
h
en
r
emoving non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
nd
Enable cus
t
o
m schemes for column
c
olors in the graph A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Her
l
and
Make graph_next_line() available in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revis
i
o
n: Tur
n
off histo
r
y
s
implification in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
re
v
ision: Fix ty
p
o in --a
n
cestry-path error messa
g
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
Documentation/re
v
-list-options
.
txt: Explain
-
-ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n
Herlan
d
D
o
c
umentation
/
r
e
v-l
i
st-o
p
t
i
ons
.
txt: Fix
m
is
s
ing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure "index
$
from
.
.
$to"
line c
o
n
t
ain
s
unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
built
i
n-note
s
: Minor (
m
o
stly
p
arse_opt
i
o
ns-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
erland
subm
o
dule
s
u
mmar
y
:
Don't
b
arf when
i
n
voked in
a
n empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
b
uilti
n
-notes: A
d
d "c
o
py" subcommand
f
or
copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-n
o
te
s
: Misc
.
refactoring of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
builtin-notes: Add -
c
/-C op
t
ions for reusing not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
builtin-notes: Refactor handling of -F
option
t
o allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
bu
i
lti
n
-notes: Deprecate t
h
e -m
/
-F opt
i
ons for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Add "append" subcommand for appe
n
d
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
u
il
t
in
-
no
t
es: A
d
d "add" su
b
c
o
m
mand for
a
dd
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-n
o
tes:
Add --mes
s
age/--file aliases for
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
lan
d
builtin-
n
ote
s
: Add "list
"
subcommand fo
r
listing
n
ote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Do
c
umentation: Generalize git-note
s
docs
t
o 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herla
n
d
builtin-
n
otes: Add "
p
run
e
" subc
o
mmand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
No
t
es API:
p
r
u
ne_n
o
t
e
s(
)
: Pr
u
n
e
notes that belong t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t330
5
:
V
erify
t
hat removing notes triggers
autom
a
t
i
c
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilt
i
n-notes: Add "remove" subcomm
a
nd f
o
r removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
Teach b
u
iltin
-
notes to remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
each notes code
t
o prope
r
l
y
p
reserve non-no
t
e
s
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t
3
305:
V
e
ri
f
y that adding many notes with gi
t
-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
t3301: Ver
i
fy succe
s
sful
a
nnotati
o
n of non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
Builtin-
i
fy g
i
t-n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Refa
c
to
r
note
s
concatenation into a fl
e
x
i
ble inter
f
ac
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
ote
s
API: Al
l
ow multiple co
n
c
urrent notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Not
e
s AP
I
: write_notes_t
r
ee(
)
: Store the notes tr
e
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
Notes API: for_e
a
ch_note
(
): Traverse the en
t
ire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes API: get_note(): Return t
h
e note annotatin
g
the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
Notes API: remov
e
_note(): Remove note o
b
jects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
N
otes API
:
a
d
d_note(): A
d
d note obje
c
ts to the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Notes API: init_
n
otes(): In
i
tialize
t
he notes tre
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
e
rland
Add tes
t
s
for checking correc
t
handling of $GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
get_commit_notes()
-
> format_note() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
M
i
nor co
s
m
e
tic
fixes t
o
n
otes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an He
r
land
b
uiltin-config:
F
ix c
r
ash when using "-f <rel
a
t
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
e
rland
Add more te
s
tcases to test fast-
i
mport of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herland
Rename t9301
t
o
t
935
0
, t
o
make room f
o
r mor
e
fast
-
impo
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erland
fast-import: Proper
n
ot
e
s tre
e
manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next