repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
remove old hash.[ch] implementation
2013-10-12
Johan
Herland
g
i
t
-svn: Warn about changing
d
e
fault for
--
p
ref
i
x in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
Documentation/git-
s
v
n
: Promote the use of --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan Herland
sample pre-
c
ommi
t
h
o
ok:
u
s
e
--bool when r
e
trieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t
3200:
A
dd
tes
t
demonstrati
n
g minor reg
r
es
s
ion
in 4
1
c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
Refe
r
to bra
n
ch
.
<name>
.
re
m
ote/merge when do
c
umenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erlan
d
t3200: Minor
fi
x
when preparing
f
o
r tracking failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024: Fix &&-chaining and a co
u
pl
e
of typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan H
e
rlan
d
Move crea
t
e_not
e
s_c
o
mmit()
f
rom notes-
m
erge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
h
a
n
Herland
Move cop
y
_note_for_re
w
r
it
e
+ frie
n
ds from bu
i
ltin/
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herlan
d
fini
s
h_copy_notes_for_rewrite(): Let caller
provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossary:
U
pdate and
rephrase the defini
t
ion o
f
a r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
oha
n
H
erland
branch
.
c
: Valida
t
e trackin
g
bra
n
c
h
e
s with r
e
f
specs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
oh
a
n Her
l
and
t
9
114
.
2:
D
on't
u
se
--track option
a
gainst "svn-r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
7
2
01
.
24:
Add
refsp
e
c to k
e
ep --
t
r
a
ck workin
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t3200
.
39: t
r
acking setup shoul
d
f
a
i
l if
there is
no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
checkout:
Use r
e
mote refspecs when DWIMming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t2024: Show f
a
ilure to u
s
e refspec when D
W
IMming re
m
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han He
r
land
t2024: A
d
d tes
t
s
ve
r
ifyin
g
curr
e
nt DWIM
behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
e
rland
git
s
ymbolic-ref
--d
e
lete
$
symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
H
erland
Fix failure
t
o delete a packed re
f
thr
o
ugh
a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t
1400-u
p
date-
r
ef: Add test
v
erifyi
n
g bu
g
w
ith
s
y
m
r
e
fs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
an
d
n
otes-m
e
rge: Don'
t
r
e
move
.
git/NO
T
ES_MERG
E
_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
n
o
tes-merge: use
opendir/
r
ead
d
ir instead
of 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 He
r
la
n
d
t
3310: illustrate failure
t
o "notes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
f
a
s
t-import:
Fix incorrect
f
an
o
u
t
level when modifyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t9
3
01: A
d
d 2nd tes
t
case exposin
g
b
u
gs
i
n
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Her
l
a
nd
t9
3
01: Fix testcase
c
overing up a bug in fa
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t54
0
0: Fix a cou
p
le o
f
ty
p
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herl
a
nd
Mark
dir
s
t
a
t error messages
for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Im
p
rove
error handling when parsing
dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
New --di
r
stat=li
n
es
m
ode,
doin
g
d
i
rstat a
n
alysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
A
llow spe
c
ify
i
ng --di
r
stat cut-off percentage a
s
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add confi
g
va
r
iable
for
specif
y
ing de
f
ault
-
-
dirsta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oha
n
Herland
Refacto
r
-
-dirstat parsin
g
; depr
e
c
a
te --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rla
n
d
Mak
e
--dirstat=0 output dire
c
t
o
ries that
cont
r
ibute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
A
dd several test
c
ases for
-
-d
i
rstat and f
r
iends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
land
--dirstat: In case
o
f
renames, u
s
e
t
arget
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --d
i
r
sta
t
no
t
to comp
l
e
t
el
y
ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herlan
d
--dirstat-by-file: M
a
ke it faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
--dirstat: Describe non-obvious
differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han
Herl
a
nd
Make
"
git
n
o
tes add" more
u
ser-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
l
og/pre
t
ty
-
options: Docum
e
nt --[no-]notes and
d
eprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han Herland
br
a
nch/check
o
ut --track: Ensure that upstream
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
o
h
an Herlan
d
p
u
s
h
.
default: Rename 'tracking' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
rovide 'git merge --abort' as a sy
n
onym to 'git rese
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
cmd_merg
e
(): Par
s
e
o
p
t
ion
s
before checking
MERGE_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Provide
'
gi
t
n
o
tes get-ref' to
easily retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
g
i
t
notes
m
e
rge: Add testcase
s
f
or merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes merge: Add another auto-resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes
m
erge:
-
-com
m
it should fail if und
e
rly
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git
n
otes
m
erge: List con
f
li
c
ting notes in
n
o
t
e
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erla
n
d
g
i
t notes merg
e
: Manual
c
o
nflict resoluti
o
n
, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e: Man
u
al conflict resolut
i
on, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Do
c
u
m
entation: Preliminary docs on 'git n
o
tes me
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
gi
t
notes merge:
Add aut
o
matic conflict resolver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes m
e
rge: Handle real, non-conf
l
icting
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
b
uiltin/notes
.
c: Refactor creation of
notes com
m
its
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Initial implementation handling t
r
ivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
u
iltin/notes
.
c: Split
n
o
t
es ref DWIMmery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
notes
.
c: Use
t
wo ne
w
l
i
nes (i
n
ste
a
d
o
f one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(tr
i
vial
)
t
3
303: Ind
e
nt wi
t
h tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
n
o
tes
.
h/c: Propagate comb
i
ne_notes_fn
re
t
ur
n
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
n
otes
.
h
/c: Allow combine
_
notes fu
n
ct
i
on
s
to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
n
o
tes
.
c: Reorder functions
i
n preparation for
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herl
a
nd
no
t
es
.
h:
M
a
k
e
de
f
aul
t
_
n
o
t
es
_
ref(
)
a
va
i
lable in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herlan
d
(
trivial) notes
.
h: Minor
d
o
c
umenta
t
io
n
fix
e
s to cop
y
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexif
y
SHA1 in die()
m
es
s
age
fr
o
m
i
nit_note
s
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herlan
d
notes: Don't
c
reat
e
(empty) commit wh
e
n removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custom scheme
s
for column co
l
ors i
n
the
g
r
aph
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herla
n
d
Ma
k
e graph_next_line() available in the graph
.
h A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
re
v
ision:
T
u
r
n off history
sim
p
l
i
fica
t
ion in --ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typo in
-
-
ancestry-pa
t
h
e
rror m
e
ssage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
Docu
m
en
t
ation/rev-list-options
.
t
x
t
:
Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han He
r
land
Documenta
t
ion/rev
-
l
i
st-options
.
txt: Fix mis
s
ing
line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
dif
f
.
c:
E
nsure "in
d
ex $f
r
om
.
.
$to" line contain
s
unambi
g
u
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
Herland
builtin-notes
:
Minor (mostl
y
p
a
rse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule summary: Don't
ba
r
f when
i
n
voked in an emp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rland
buil
t
in-no
t
es: Add "
c
op
y
" subcomman
d
for
c
opying no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes
:
Misc
.
refactoring
o
f a
r
gc
a
nd
exi
t
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes:
Add -c/-C o
p
tions for reusing
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
lt
i
n-notes
:
R
e
f
a
ctor han
d
ling of -F o
p
t
ion to
al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
and
builti
n
-
notes
:
Depr
e
cate the -m/-F optio
n
s for
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-
n
o
tes: Add "append" su
b
c
ommand for appe
n
ding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
builtin-notes:
A
dd "add" subc
o
mman
d
for adding no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-
n
otes
:
Add --me
s
sage/--f
i
le al
i
ases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
la
n
d
b
uiltin-notes: Add "list" subcomm
a
nd for li
s
ting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
Documentation: Generali
z
e
g
it-n
o
tes docs
to '
o
b
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes: Add
"prune" su
b
command f
o
r removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Note
s
API: prune_
n
otes():
Prune notes that bel
o
n
g
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
t3305
:
Verify that removin
g
notes trigg
e
rs
a
utomat
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herl
a
nd
bu
i
ltin-notes: Add
"
remove" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rla
n
d
Teach builtin-
n
ot
e
s to remove empty n
o
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
T
ea
c
h notes c
o
de to pr
o
p
erly preserve non
-
n
otes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
t3305:
V
erify t
h
at adding
many notes wit
h
git-not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify successful annotati
o
n of n
o
n-comm
i
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rl
a
nd
B
u
iltin-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
Ref
a
ctor notes
concatenation into a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
Notes API:
A
llow multi
p
l
e
concurrent notes tr
e
e
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
API
:
write_not
e
s_tree(): Sto
r
e
the
no
t
es tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Her
l
an
d
Notes A
P
I: for_each_n
o
te(): Trav
e
r
s
e t
h
e
e
ntir
e
note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next