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
Merge branch 'jk/commit-date-approxidate'
2014-11-14
Johan Herland
t33
0
1: modernize style
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
notes
:
em
p
ty notes s
h
ould be shown by 'git
l
o
g'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
ohan
H
e
r
l
a
n
d
b
uiltin
/
no
t
es: add --allow-empty, to allow storing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
o
h
an Herland
bu
i
ltin
/
notes: split cre
a
te_note() to clarify add vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Her
l
and
builtin/notes
:
simp
l
i
fy early exit co
d
e
i
n
ad
d
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joh
a
n Herland
builti
n
/
notes: refacto
r
no
t
e file pat
h
into str
u
ct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herlan
d
b
u
il
t
i
n/no
t
es: improve
naming
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
t33
0
1: verify th
a
t 'gi
t
notes' removes emp
t
y n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herla
n
d
builtin/notes: f
i
x prema
t
ure failu
r
e
w
h
en trying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Joh
a
n Herland
Git 2
.
0
:
git s
v
n
:
S
e
t
d
efault --pr
e
fix='origin/'
if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
J
oha
n
Herland
notes: disallow r
e
u
sing non-blob as
a
note ob
j
ect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Jo
h
an H
e
r
l
and
sha1_file
.
c:create_tmpfil
e
(): Fix race when
c
reating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan He
r
land
g
i
t-svn: Warn
about changi
n
g
default for --p
r
efix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
J
o
h
an Her
l
a
nd
Documentation/git-svn: Prom
o
te
t
he
u
se
o
f --pref
i
x
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan Herland
sample pre-commit h
o
ok: use --bo
o
l
w
hen retr
i
e
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an
He
r
land
t
3
2
0
0: Add test dem
o
nstrating mino
r
r
egres
s
ion
in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herland
Refe
r
to branch
.
<name>
.
r
e
mote/
m
erge
when documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erland
t3200: Minor
fix when prepari
n
g for tracking
failu
r
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
oh
a
n Her
l
a
nd
t2024: Fix &&-chainin
g
and a couple of t
y
pos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
Herland
Move create_no
t
e
s
_commit
(
)
f
r
om
n
otes-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
n
d
M
ove cop
y
_note_for
_
rewrite + frien
d
s from bu
i
ltin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
erland
finish_copy_notes_f
o
r_rewrite(): Let caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossary: Up
d
ate and
r
ephrase t
h
e
de
f
ini
t
io
n
of
a
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
n
d
branch
.
c: Validate tr
a
cking b
r
anches
w
ith refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t91
1
4
.
2: Don't
u
se --track op
t
ion aga
i
n
st "svn
-
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herlan
d
t720
1
.
24
:
Ad
d
refspec to keep
--track w
o
r
king
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t
3200
.
39: tracking setup should fail if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use re
m
ote re
f
specs whe
n
DWI
M
ming tracki
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
2024:
Show failure t
o
use ref
s
pec when DWIMming r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
a
n Herland
t2024:
A
d
d tests
verifying current DWIM b
e
havio
r
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herla
n
d
gi
t
symbo
l
ic-re
f
--del
e
te $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herland
Fix fail
u
re to delete a packed
ref through
a
sy
m
ref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herl
a
nd
t1400
-
update-ref: Add t
e
st veri
f
y
i
n
g
bug wit
h
sy
m
r
e
fs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-
m
erge:
Don't
r
emove
.
git/
N
OTES_MERGE_WORKTR
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
notes-merge: us
e
opendir/re
a
ddir instead
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
Johan Herland
t3310: il
l
ustrate fail
u
re to "
n
otes merge
-
-comm
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
fast-import
:
Fix inc
o
rrect fano
u
t level when modi
f
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
t93
0
1: Add
2nd
t
estcase
e
xp
o
sing bugs
in f
a
st
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
t9301: Fi
x
testcase covering up a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herl
a
nd
t5400: Fix a couple of typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
H
erland
M
a
rk dirstat error messages for translati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
an
d
Impr
o
v
e
e
rr
o
r handl
i
ng when par
s
ing dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dirstat=lines m
o
de,
d
oing
d
irstat
analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Allow
specifying --dirstat c
u
t
-
off
percentage
a
s a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Add
config v
a
riable for specifying d
e
fault --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Her
l
and
Refa
c
tor --dirst
a
t par
s
ing; depreca
t
e --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
M
ak
e
--d
i
rstat=0
output dire
c
tories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Add sev
e
r
al testcas
e
s for --dirstat and
friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
--
d
irstat: In case of r
e
names,
use t
a
rge
t
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rlan
d
T
e
ach --
d
irstat not to com
p
letely
ignore rearrang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-b
y
-f
i
le: Make it fast
e
r and more corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--dirsta
t
:
Descri
b
e no
n
-ob
v
ious differe
n
ces rel
a
t
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
Make "git no
t
es ad
d
" more user-friendly when the
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
erland
l
og/p
r
et
t
y
-
opti
o
ns: Document --[no-]note
s
and de
p
re
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Her
l
and
b
r
anch/
c
hec
k
out --t
r
ack: Ens
u
re
t
hat upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
Herland
push
.
d
efault: R
e
name 'tra
c
kin
g
' to 'upstre
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Provide 'git me
r
ge --
a
bort' as a
s
ynonym to
'
git
r
eset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herl
a
nd
cmd_merge(): Pars
e
options
b
efore checking ME
R
GE_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provi
d
e
'
git notes get-r
e
f' to easily ret
r
ieve cu
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git note
s
merge: Add
te
s
tcase
s
f
o
r me
r
ging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes me
r
ge: Add anot
h
er auto-resolving stra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: --commit shou
l
d
fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes
merge: List c
o
nflictin
g
notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes me
r
ge: Ma
n
ual conflict
resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git
notes m
e
rge: Manual conflict resolu
t
ion, part
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herl
a
n
d
Documentatio
n
:
P
relimin
a
r
y
docs
o
n 'gi
t
not
e
s merge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge
:
Add automatic conflic
t
res
o
l
v
ers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herlan
d
git notes merge: Handle real, non-conflic
t
ing note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/n
o
tes
.
c: Refact
o
r creation of notes comm
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
Initi
a
l
impl
e
mentation handling
t
r
i
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
buil
t
in/notes
.
c
:
Split n
o
tes r
e
f
D
W
I
Mme
r
y into a sep
a
rate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c:
U
se two new
l
ine
s
(ins
t
e
a
d o
f
one) whe
n
concate
n
ati
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
(trivial) t3303:
I
n
dent with tab
s
instea
d
of space
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c:
P
ropagate
c
o
mbine_not
e
s_f
n
return
val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
note
s
.
h/c: Allow
co
m
bin
e
_
notes funct
i
ons to
rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
e
rland
not
e
s
.
c: Reorder functions
i
n preparation f
o
r next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
n
o
tes
.
h: Make def
a
ult
_
notes_ref
(
) availab
l
e
i
n
notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
(
tri
v
ial)
notes
.
h
:
Minor do
c
umentation fix
e
s to
co
p
y
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
c:
Hexify S
H
A1 in die() message from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
H
er
l
and
notes: D
o
n't create (emp
t
y) co
m
mit
w
hen
r
emoving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
h
an Herl
a
n
d
Enable custom sch
e
mes for
c
olumn col
o
r
s
i
n th
e
gr
a
ph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an
Herland
Make gra
p
h_next_line() avail
a
b
l
e
i
n the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an
H
erland
revisi
o
n
: Turn off
history si
m
p
l
ification in --anc
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
r
e
vision: Fix t
y
po in --ancestry-pat
h
error mess
a
ge
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docu
m
entation/
r
ev-list-optio
n
s
.
txt
:
Exp
l
ain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
Documentation/
r
ev-list-optio
n
s
.
txt: Fix
missing
l
i
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herlan
d
diff
.
c: Ensure "in
d
ex $
f
r
o
m
.
.
$to" line c
o
nt
a
ins
unam
b
iguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
r
l
a
nd
builtin-notes: Minor
(mostly pars
e
_op
t
io
n
s-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an Herland
s
u
bm
o
dule su
m
m
a
ry: Don
'
t bar
f
w
h
en invo
k
ed
i
n an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Ad
d
"copy" subcomma
n
d for copying
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-
n
otes: M
i
sc
.
refactoring of argc
a
nd exit va
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bu
i
ltin-notes: Add -c/-C options for
r
eusing no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes: Refactor
h
andling of -
F
opt
i
on to all
o
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-
n
otes: Deprecate th
e
-m/-
F
options for
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
bu
i
ltin-notes: Add "appe
n
d
" subcommand for
appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
builtin-notes
:
A
dd
"
add"
su
b
co
m
ma
n
d
f
or add
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-not
e
s: Add --mes
s
age/
-
-file aliase
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin-notes:
A
dd "list" subcomm
a
nd
for listin
g
note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Documentatio
n
:
Generalize git-notes doc
s
to
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builtin-note
s
: Add "pr
u
ne" subcommand
for removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next