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
Git 1.8.4.5
2013-09-09
Johan Herlan
d
t3200: Add
test demonstrating
minor regr
e
ssion in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han H
e
r
land
Refer
to branch
.
<name>
.
remo
t
e
/
mer
g
e when documentin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n He
r
land
t3
2
00:
M
i
n
or fix when preparing for tracki
n
g failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
ohan Herlan
d
t
2024: Fix &
&
-chain
i
ng
and
a
couple of
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan H
e
r
l
a
n
d
Move create_notes_commit() from notes-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herla
n
d
Move copy_not
e
_for_rewrit
e
+ frie
n
ds from b
u
ilti
n
/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n
He
r
land
finish_copy_n
o
tes_for_
r
ewrite(): Let caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
glossary: Update an
d
rephrase the d
e
finition of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Validate tracking b
r
anches with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han H
e
rland
t9114
.
2: Don
'
t use --trac
k
op
t
ion against "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herla
n
d
t7201
.
24: Ad
d
refspec to
k
e
e
p --track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
t320
0
.
39: tracking setup sho
u
ld 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 re
f
spec
s
when DWIMming track
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
t202
4
: Show failure t
o
use refspec when
DWIMming
r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
2024: Add tests veri
f
yin
g
current D
W
IM behavi
o
r of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
nd
gi
t
symbolic
-
ref
-
-delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rl
a
nd
F
ix failure t
o
del
e
te a packed ref through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herla
n
d
t
1400-upd
a
te-r
e
f:
Add test verifyin
g
bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an
H
erland
notes-merge:
D
on't remove
.
git/
N
O
T
ES_
M
ERGE_WORKT
R
EE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
h
a
n
Herland
n
o
tes
-
m
e
rge:
use
opendir/readdi
r
i
nstead o
f
us
i
n
g
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 Herland
t3310:
illust
r
ate fail
u
r
e
to
"
notes merge -
-
commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
fast-
i
mport: Fix i
n
correct fanout l
e
vel wh
e
n modify
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
t9301
:
Add 2nd testcase exposing bug
s
in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
t9301: Fi
x
t
e
stcase covering up a bug
in fas
t
-imp
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
o
h
a
n Her
l
a
nd
t
5
40
0
:
F
ix a
c
o
u
ple
o
f typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an He
r
l
and
Mark d
i
rsta
t
error
mess
a
ges for tr
a
nslation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herlan
d
Impr
o
ve error
handling when pa
r
si
n
g dirstat param
e
ters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dirstat=l
i
nes m
o
de, d
o
ing d
i
rst
a
t analy
s
is bas
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n Herl
a
nd
Allow s
p
ec
i
fying --di
r
stat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add co
n
fig var
i
abl
e
for
specifying de
f
ault --d
i
rstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Refac
t
or --dirstat parsing; depreca
t
e --cumulati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
M
a
ke
-
-di
r
stat=0 output director
i
es
that c
o
ntribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several testc
a
ses f
o
r --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
ohan Herla
n
d
--dirstat: I
n
c
a
se
of renames, use t
a
r
g
et f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan
Herlan
d
Teac
h
--d
i
rstat not
t
o completely ignore rearra
n
g
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
r
l
a
n
d
-
-dirsta
t
-by-file: Make it faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirs
t
at: Des
c
r
ib
e
non-
o
b
v
ious
d
iffe
r
ences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
Make "git notes add" more u
s
er-frien
d
l
y whe
n
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an
He
r
lan
d
log/pret
t
y-
o
ptio
n
s
:
Docu
m
e
nt --[no-]notes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
erland
b
r
anch/checkout --tra
c
k: Ensure t
h
a
t up
s
t
ream
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
Herland
p
ush
.
default: Re
n
ame 'tracki
n
g' to
'ups
t
ream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Pro
v
ide 'git merge --abo
r
t' as a synonym
to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
cm
d
_merge(): Parse options
before checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
r
l
and
Provid
e
'git notes
get-ref
'
to eas
i
ly r
e
trieve
c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
Herland
git notes merge:
A
dd testcases for merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erlan
d
git notes merg
e
:
Add another a
u
to-resolving
stra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rlan
d
git notes merge: --com
m
it should
f
ail if underl
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge: List co
n
flic
t
ing notes in n
o
tes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merg
e
: Ma
n
ual
c
onflict
r
esolution, pa
r
t 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
gi
t
notes merg
e
:
Ma
n
ual co
n
fl
i
ct
r
esolut
i
o
n, part
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rl
a
nd
Documenta
t
ion: Pr
e
l
i
mina
r
y docs o
n
'git
n
otes mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
A
dd auto
m
atic conflict r
e
so
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge: Ha
n
dle real, non-confl
i
c
ting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
built
i
n/notes
.
c: Ref
a
ctor cre
a
tion of notes
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes
merge: Initial implementatio
n
handling trivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
builtin/notes
.
c: Split notes ref DW
I
Mmery
int
o
a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
es
.
c:
U
se two newlines
(instead of one
)
w
h
en concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
l
a
nd
(trivial)
t33
0
3: Indent
w
i
t
h
tabs instead of spac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
h/
c
: Propagate comb
i
ne_notes_f
n
re
t
ur
n
val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
n
o
tes
.
h/c: Allow combine_notes functions to remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
:
Reorder
f
unctions in pre
p
aration for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h:
M
ake
d
efa
u
lt_note
s
_ref() available in note
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
r
l
and
(trivial
)
notes
.
h: M
i
n
or docume
n
tation fixes to
c
opy
_
notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
c: Hexify SHA1 i
n
die() mes
s
age
f
rom ini
t
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
H
erland
notes: Don't
c
reate (empty) com
m
it wh
e
n re
m
o
ving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
E
nabl
e
cus
t
om sche
m
es for c
o
lumn co
l
ors
i
n the g
r
aph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
h
a
n Her
l
and
Mak
e
g
raph_
n
ex
t
_line() availa
b
le in the
graph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
revision
:
Turn off history simp
l
ific
a
ti
o
n
in --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
a
n
d
revision:
Fix typo
in
-
-
ancest
r
y-path
e
rr
o
r message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
umentat
i
o
n
/rev-list-options
.
txt: Explain --anc
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Document
a
t
ion/r
e
v-list-options
.
txt:
Fix mis
s
i
n
g line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herlan
d
diff
.
c
: En
s
ure "index $from
.
.
$
t
o" l
i
ne co
n
tains
u
nambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Herl
a
nd
builti
n
-notes: Minor (mostly
p
arse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han Herland
submodul
e
summary
:
Don
'
t bar
f
when invoked
in an e
m
pty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilti
n
-not
e
s: Add "copy"
s
ubcommand for copying
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin
-
notes
:
Misc
.
re
f
actoring
of argc and exit v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
u
iltin-notes: Add -c/
-
C options for
reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin
-
no
t
es: Refac
t
or hand
l
ing of -F option t
o
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
uilt
i
n-notes: De
p
r
e
ca
t
e th
e
-
m
/-
F
opt
i
ons for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Add "appe
n
d" subcomma
n
d for appendi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-
n
otes:
A
d
d "add
"
subcommand
f
o
r
a
dding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add --
m
e
s
s
age/--file aliases fo
r
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bui
l
tin-notes: Add "list
"
subcommand for
listing
n
o
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
la
n
d
Documentati
o
n: Gener
a
lize git-notes do
c
s to 'o
b
jects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes: Add "prune" subc
o
m
mand for
r
emoving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rla
n
d
Notes API: prune_notes(): Prun
e
notes that bel
o
n
g
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t33
0
5: Verify th
a
t
r
em
o
v
i
ng
notes
triggers
automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
built
i
n-notes: Add "remove" subcomm
a
n
d
f
o
r
remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Teach
b
uilti
n
-notes
t
o remove
e
m
p
ty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
n
otes c
o
de to pro
p
e
rly
p
r
es
e
r
ve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
t330
5
: Ver
i
f
y
that adding many notes with gi
t
-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify s
u
c
c
essful
a
n
not
a
ti
o
n of
n
on-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
B
uiltin-
i
fy git-note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Refacto
r
no
t
es
c
o
nc
a
tenat
i
on i
n
to a fle
x
ibl
e
inte
r
face
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
P
I: Allow multiple c
o
ncurrent no
t
es t
r
e
e
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes
API: write
_
note
s
_tre
e
()
:
Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: for_each_no
t
e()
:
T
r
averse the
entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
No
t
es AP
I
: g
e
t
_
note(): Retur
n
the note annotat
i
n
g
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: r
e
m
ove
_
note(): Remove note obj
e
c
ts
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
o
te
s
API: add_note(): Add no
t
e objec
t
s to the int
e
rnal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next