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
diff --check: honor conflict-marker-size attribute
2010-03-25
Junio C Ham
a
no
di
f
f --che
c
k
:
honor conflict-marker-siz
e
attribut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C Ha
m
a
n
o
rerere: honor
c
o
n
flict-
m
a
r
ker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ha
m
a
no
rer
e
r
e:
prepare for cu
s
tomizable conflic
t
marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
co
n
f
l
i
c
t-marker
-
size: ne
w
a
t
t
ribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: use
l
l_me
r
ge(
)
i
nstead of usin
g
xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
merge-
t
ree: use
l
l_merge() not xdl_m
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_
m
erge(
)
: all
o
w passing down
marker_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ham
a
no
xdl_merge(): int
r
oduce xmparam_t
f
or merge specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
git
_
a
t
tr(): fi
x
funct
i
on s
i
gna
t
ure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C
Hamano
rerere forget path:
forget recorded resolution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Ju
n
io C Hamano
r
e
rere: refactor rerere logic
to make i
t
inde
p
endent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
rerere: r
e
move sil
l
y 10
2
4
-
byte
l
ine
limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Hamano
resolve-undo: teac
h
"update-inde
x
-
-unresol
v
e
" to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
re
s
olve
-
undo: "checkout -m
p
a
th"
u
ses resolve
-
undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-undo: allow
plumbing t
o
cle
a
r t
h
e information
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
resolve-undo
:
basic
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
i
o
C Ha
m
a
no
resol
v
e
-undo: record
r
esolved conflic
t
s in a
n
ew index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
builtin
-
merge
.
c: use standard active
_
cache
m
ac
r
os
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Hamano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Juni
o
C Ha
m
ano
Me
r
ge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2009-12-22
David Re
i
ss
P
r
e
v
e
nt git blam
e
from segfaulting on a m
i
ssing author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
Git 1
.
6
.
6-
r
c4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
H
amano
Mer
g
e branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-12-20
Björn
G
ustavs
s
on
rebase -
i
: ab
o
rt
c
leanly
i
f the editor fails to launch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
St
e
phen Boyd
technica
l
-docs: doc
u
ment
h
a
sh
A
P
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Steph
e
n Boyd
api-strbuf
.
t
x
t: fix typos and do
c
ument l
a
un
c
h_editor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
a
mano
G
i
t 1
.
6
.
6
-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hamano
Me
r
ge
b
ranch 'maint
'
t
o
sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C H
a
mano
G
it 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
worktree: don't segfault with an absolute pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jeff K
i
ng
ignore
u
nknown color co
n
f
igurati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Si
x
t
hel
p
.
a
utocorrect: do
n
o
t run a comm
a
nd if the comma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nan
a
k
o
Shi
r
aishi
Illustrate "filter" attribute with an example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gu
s
tavsson
b
ash: Support new 'git fetch' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C
Hamano
U
p
date R
e
lease N
o
tes for 1
.
6
.
6 to remove old b
u
g
fi
x
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C Hamano
Syn
c
with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hama
n
o
Fix archiv
e
form
a
t
w
it
h
-- on the co
m
mand lin
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remove post-upload-hoo
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Ha
m
ano
Git 1
.
6
.
6
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
aman
o
M
e
rge git://repo
.
or
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2009-12-09
J
unio
C H
a
m
ano
Merge gi
t
:
/
/git
.
kernel
.
org/pub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Up
d
ate
d
raft release n
o
tes to 1
.
6
.
6 before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merg
e
branch '
m
m/ma
i
n
t
-merge-ff-
e
rr
o
r-me
s
sag
e
-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Hamano
Merge branch 'jn/m
a
i
nt-pull-r
e
base-error-message'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Me
r
ge branch
'jk/maint-add-p-delete-fix' int
o
m
aint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
g
it://git
.
b
o
gomip
s
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert r
e
cent "git merge <m
s
g> HEAD <commit
>
.
.
.
" deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add
-
in
t
eractive: f
i
x d
e
letion of no
n
-empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
bash: upda
t
e
'
git commit' compl
e
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C
H
amano
Sync w
i
th 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torval
d
s
F
i
x diff -B/--dirstat miscount
i
n
g
of newl
y
added contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff Kin
g
reset: improve worktree
s
afety valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullin
g
er
D
o
cumentation: Avoid use of x
m
lto
-
-
s
tr
i
ngparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
ar
c
hive: clarify de
s
cription
o
f path par
a
meter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff
K
ing
rerere: don't segf
a
ult on failure to open rr-
c
a
che
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
amano
M
e
r
g
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C H
a
mano
Prepare for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ham
a
no
Me
r
ge branch '
u
k
/maint-shortl
o
g-encoding' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'fc/maint-format-patch-pathspec
-
das
h
es
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge
branch
'ap/ma
i
nt-merge-strategy
-
l
i
s
t
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Haman
o
M
e
rge branch
'
jc/mai
n
t-am-keep'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge br
a
nch 'rs/work-arou
n
d-grep-
o
pt-insan
i
t
y
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merg
e
b
ranch
'rj/maint-cy
g
win-count-objec
t
s' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge br
a
nch 'mm/mai
n
t-hint-
f
a
iled-merge' i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
M
erge branch 'th/maint-r
e
mote
-
update-help-string' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
nch 'rj/maint-
t
9
7
00
'
int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Me
r
ge br
a
nch 'ls
/
main
t
-ma
i
linfo-no-inbody' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'm
o
/maint-crl
f
-doc' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 't
h
/remote-
u
sage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge b
r
anch 'pb/maint-use-custom
-
perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
m
m/config-pathname-
t
ilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch '
b
c
/
grep
-
i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge
branch 'jk/maint
-
brea
k
-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hamano
Merge branch 'rj/maint-simplify-cygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
m
ano
Merge bran
c
h 'rg
/
doc-workflow' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hama
n
o
M
e
rge
b
ranch '
n
p/ma
i
nt-sideband-favor
-
statu
s
' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jak
u
b
Nar
e
bs
k
i
gitweb:
D
es
c
ribe (possible) gitweb
.
js minification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Doc
u
ment
a
t
i
o
n: xmlto
0
.
0
.
18 does
no
t
know
-
-
s
tringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
o
han Herl
a
n
d
F
i
x c
r
a
sher
o
n e
n
c
o
unteri
n
g SHA1-like
no
n
-note in
n
ot
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Br
a
ndon
C
asey
t90
0
1
:
u
se
o
lder Geto
p
t
::
L
ong
b
oolean prefi
x
'--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Br
a
ndon Casey
t4201: u
s
e
I
S
O
8859-1 ra
t
her than I
S
O
-
8859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull: clari
f
y advice for the unconfigured error cas
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hama
n
o
Merge
in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Haman
o
Unconditionally
s
et m
a
n
.
base
.
url
.
fo
r
.
relative
.
li
n
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
G
i
t
1
.
6
.
6-r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
vo
n
Brand
git-pull
.
sh: Fix
call t
o
git-merge f
o
r new
c
o
m
mand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C H
a
mano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C H
a
mano
Prepare for
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io
C
H
a
mano
merge: do n
o
t
add sta
n
dard
message
w
h
en message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
D
o
n
ot
misident
i
fy
"
git merge foo H
E
AD"
a
s an old-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Upda
t
e
dr
a
ft rele
a
se notes
to 1
.
6
.
6
before
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
unio
C Ha
m
ano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rg
e
branch
'jc/deprecate-ol
d
-sy
n
tax-
f
rom-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-merge: a
deprecation
n
otice of the ancient com
m
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rge branch 'bw/rem
o
te-
g
et
-
ref-states-
f
ix'
commit
|
commitdiff
|
tree
2009-12-01
Bert Wes
a
rg
ge
t
_ref_states
:
st
r
d
u
p entries
a
nd free util in
stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next