repo.or.cz
/
git
/
mingw.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/colors-fix'
2014-11-14
Johan
Herla
n
d
t3301: modern
i
z
e
s
tyle
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan He
r
land
n
otes: empt
y
notes should be
shown
by 'git log
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herlan
d
buil
t
in/n
o
t
e
s:
add -
-
allow-empty,
to
a
l
low storing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Jo
h
a
n Herland
builtin/n
o
tes: s
p
lit create_note() to clarif
y
ad
d
vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
o
han Herland
builtin/notes: s
i
m
p
l
i
fy earl
y
exit cod
e
in
a
dd()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
bu
i
l
t
in/
n
otes: r
e
factor note f
i
le path into struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Jo
h
an
Herland
builtin/notes: improve n
a
ming
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
o
h
a
n Herland
t3301: v
e
rify
t
h
at 'gi
t
no
t
e
s
' r
e
m
o
ve
s
empty notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
ohan Her
l
and
builtin/notes:
fix premature failure wh
e
n
t
rying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Johan Herland
Git 2
.
0: git svn
:
Set default
-
-pre
f
ix='origin/
'
if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan
H
erland
notes: disallow reusing
n
o
n
-blob as a note objec
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan Herl
a
nd
sha
1
_file
.
c:create_tmpfile(): Fix race
w
hen c
r
eating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan
Herland
g
i
t-sv
n
: Warn about changin
g
de
f
ault f
o
r --prefi
x
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan
Her
l
and
Docume
n
t
a
tion/git-s
v
n: Promot
e
the u
s
e
of --pre
f
ix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan Herland
sample pre-commit hook: us
e
--bool when retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
a
n Herland
t3200: Add
tes
t
de
m
onstra
t
ing minor regression
in
4
1c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Refer to branch
.
<name>
.
remote/merge w
h
e
n
doc
u
menting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herland
t3200:
M
inor fi
x
when preparing
f
or tr
a
ckin
g
failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024: Fix &&
-
chaining and a coupl
e
of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
land
Move
c
reate_notes_co
m
m
it()
f
rom notes-merg
e
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
han Herla
n
d
Move copy_no
t
e_for_rewrite + fr
i
ends from builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
l
a
n
d
finish_c
o
p
y
_notes_for_rewrite():
L
et caller
p
rovide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
glossary: Update
and rephrase
t
he definition of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
br
a
nch
.
c: Validate tra
c
king b
r
an
c
hes with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2:
D
on't use --track op
t
i
on against
"
svn
-
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t7
2
01
.
24: Ad
d
refspec to keep -
-
track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
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
J
o
han Herl
a
nd
checkout: Use remote refspe
c
s
w
hen DWIMmin
g
track
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t202
4
: Sh
o
w failure
to use
refsp
e
c when DWIMming r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Add tests verifying current
D
W
IM beha
v
ior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n
Herland
g
it sy
m
bolic-ref -
-
d
elete $sy
m
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
Fix
f
ailure to delete a packed ref through a sym
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herland
t1400-update-ref: Add test verifying bug w
i
th symre
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han
Herla
n
d
notes-merge: Don't remove
.
gi
t
/
NO
T
ES
_
ME
R
GE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herlan
d
note
s
-m
e
rge: use o
p
e
n
dir/
r
eaddir instead o
f
using read_dire
c
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
h
a
n
Herl
a
nd
t
3
31
0
:
illustrate
fa
i
l
u
re to
"
n
o
t
es m
e
rge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
fast-im
p
ort: Fix inc
o
rrect fanout level when
m
od
i
fying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
t9301: Add 2nd testc
a
se
e
x
pos
i
ng bugs in fast-i
m
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301:
F
ix
t
est
c
ase c
o
v
e
ring up
a
bug
i
n
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
o
han Herland
t
5
400:
F
ix a couple
of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Mark d
i
rstat e
r
ror message
s
for
t
ransl
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Her
l
and
I
m
prove err
o
r handling
when par
s
ing
d
i
rs
t
a
t
p
arameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
New --dirs
t
a
t=
l
ines
mo
d
e,
d
oing
dirstat a
n
alysi
s
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Al
l
ow spec
i
fy
i
ng --dirs
t
at cut-of
f
percent
a
ge as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Add
c
on
f
ig var
i
able for sp
e
cifyi
n
g defa
u
lt --dirs
t
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Refactor --dirstat
p
a
rs
i
n
g; deprecate --cumu
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
H
erla
n
d
Make --dirs
t
at=0 output direc
t
ories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several
t
estcases for --dirstat and friend
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
h
an Herland
--dirstat: In cas
e
o
f
renames, use targe
t
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
He
r
land
Teach -
-
dirstat n
o
t to comple
t
ely ig
n
ore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
--dirst
a
t-
b
y-fi
l
e: M
a
ke
it faster and m
o
re corre
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe
n
o
n
-obviou
s
dif
f
erenc
e
s relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git notes add" more
user-frie
n
dly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Her
l
and
log/pret
t
y-op
t
ions
:
D
o
cument --
[
no-]note
s
a
nd deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
erland
branch
/
checkou
t
--trac
k
: Ensure
t
hat upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
Herl
a
nd
push
.
de
f
ault: Rename 'tracki
n
g' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
P
rovid
e
'git merge
--abort' as a
s
ynony
m
t
o 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erla
n
d
c
m
d_merge():
P
a
rse
o
p
t
i
o
n
s before checking MERGE_
H
EA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git n
o
tes g
e
t-re
f
' to e
a
s
i
ly
r
et
r
ieve cu
r
r
ent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e
: Add testcases for
me
r
ging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herlan
d
g
i
t notes merge
:
Add anoth
e
r auto-
r
esolvi
n
g
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merg
e
: --commit should
fail if un
d
erlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
an
d
g
it
n
otes mer
g
e: List
c
onfli
c
t
i
ng no
t
e
s i
n
notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git no
t
es me
r
ge: Manual conflict
resolution, par
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes merge: Ma
n
u
al
c
onflict resolution, part 1/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Documen
t
a
tion: Prelimi
n
ary docs on 'git
n
otes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git note
s
merge:
A
dd auto
m
ati
c
co
n
fli
c
t res
o
lvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
git no
t
es merge: Handle rea
l
, n
o
n
-
con
f
lict
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
bu
i
lt
i
n/notes
.
c
: Re
f
actor creation o
f
notes co
m
m
i
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Initial implementat
i
on handling t
r
i
v
i
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
u
ilti
n
/
notes
.
c:
Split notes ref
D
W
I
M
mery in
t
o a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two
n
ewlines (instead of one) when co
n
catenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
(t
r
i
vial) t3303
:
Indent wit
h
tabs inste
a
d of
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/
c
:
P
ropagate
combine_
n
otes_fn return
v
a
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
h/c
:
Allow combine_no
t
es functions to r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
a
nd
not
e
s
.
c: Reo
r
der
f
un
c
t
ions
i
n
preparati
o
n for
ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rla
n
d
n
o
tes
.
h: Make default_no
t
es_ref() available in notes
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
rivi
a
l) notes
.
h:
Minor doc
u
m
entation
f
ixes
t
o cop
y
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
oha
n
Herland
notes
.
c: Hexify SH
A
1 i
n
di
e
()
m
essage from ini
t
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
H
erla
n
d
n
o
t
e
s: Don't
c
rea
t
e
(e
m
pty)
commit
w
hen removing
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han
H
erland
E
n
abl
e
c
u
stom s
c
hemes for
c
ol
u
mn colors in
t
he gra
p
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
erland
Make graph_next
_
line() available in the gra
p
h
.
h A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
an Herland
revision: Turn off
h
ist
o
ry simplification i
n
-
-
ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
revis
i
on: F
i
x typo in --anc
e
stry-path er
r
or mes
s
age
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
ocu
m
entat
i
o
n
/rev-
l
is
t
-option
s
.
tx
t
: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Docum
e
ntation/rev-list-options
.
txt: Fix missin
g
line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan
Herland
diff
.
c:
Ensure
"index $from
.
.
$to" line cont
a
ins unam
b
igu
o
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an
H
erlan
d
b
uilti
n
-notes: Minor (mostly
p
ars
e
_options-r
e
la
t
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
erland
submodule
s
u
m
mary: Do
n
't barf
w
hen invo
k
ed in an
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-n
o
tes:
Add "copy
"
subcommand f
o
r copying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Misc
.
refactorin
g
of
a
rgc
and exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Add -c/-C
op
t
ions
f
or reusing not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Refactor handling of -F option
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes: Deprecate the -m
/
-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
builtin-
n
otes:
A
dd "ap
p
end" sub
c
ommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Her
l
and
builtin-notes: Add "add"
subcommand for adding n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-not
e
s: Add --message/--file aliases fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
er
l
and
builtin-notes: Ad
d
"list
"
subcom
m
and for
listing
note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
r
l
and
Documenta
t
ion: Generaliz
e
g
i
t
-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
l
and
b
u
il
t
in-notes:
A
dd
"pru
n
e" subco
m
m
and for
r
emoving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next