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 H
a
mano
diff --check: hon
o
r conflict-marker-
s
ize attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
rer
e
re: honor co
n
f
lic
t
-m
a
rker-size att
r
ibut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C Hamano
rerere: prepare for customizable
conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
conflict-marker-s
i
z
e: new a
t
tribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
rere
r
e
: use ll_merg
e
()
instead of us
i
ng xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
merge-t
r
ee: use
ll_merge() no
t
xdl_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
xdl_merg
e
(): all
o
w
passing down ma
r
ker_size in xmparam_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
mano
xdl_merge(): int
r
o
duce xmparam
_
t for mer
g
e sp
e
c
i
f
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Ham
a
no
git_a
t
t
r
(
)
:
f
i
x function signatu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
r
er
e
r
e forg
e
t pa
t
h:
f
orget recorded resolution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C
H
a
mano
rerere:
refactor rerere logic
to ma
k
e it independent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
a
no
rerere: remove sil
l
y
1
024-byt
e
li
n
e lim
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
r
e
solv
e
-
u
ndo
:
teach "
u
pdate-index --unresolve" t
o
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
resol
v
e-un
d
o: "checkout -m
p
ath" uses resolve-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Haman
o
r
e
s
o
lve-u
n
do:
a
llow plumbing to clear
t
he i
n
fo
r
mation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C
H
amano
r
esolve
-
undo: basic
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-undo: record
resolved
conflicts
i
n a
new index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
n
o
builtin
-
merg
e
.
c: use standard
active_cache macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C
Hama
n
o
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Juni
o
C
H
am
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
David
Reiss
Prevent
g
it
b
lame from s
e
g
f
aulting
on
a
missin
g
author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C Hamano
Git 1
.
6
.
6-r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Ha
m
ano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
r
ebase -i: abort
cleanly if the editor fails
t
o launch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boy
d
tec
h
n
i
cal-docs: d
o
cu
m
ent h
a
sh API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
api-str
b
u
f
.
txt: fi
x
t
y
pos and do
c
ument la
u
nch_editor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C Haman
o
Git
1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
Hamano
Merge branch 'maint' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
ama
n
o
G
i
t 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
Hamano
worktree: d
o
n
'
t segfault with an absolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
igno
r
e unk
n
ow
n
color co
n
fi
g
uration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johannes S
i
xt
h
elp
.
autocorrect: do not run a c
o
mman
d
i
f the comm
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nan
a
k
o
Shiraishi
Illustra
t
e
"filter" attribu
t
e
wi
t
h an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björn Gustavsson
bash: S
u
pport new 'git fetch' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
unio
C Hamano
Update
R
elease Notes f
o
r 1
.
6
.
6 to remove old bu
g
f
i
xes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C Hama
n
o
S
y
nc with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
amano
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Fix
a
rch
i
ve format wit
h
--
on the com
m
a
nd
l
i
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
Remove pos
t
-
u
pload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
i
o C Hamano
Git
1
.
6
.
6
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://rep
o
.
or
.
c
z
/
git-gui
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Ha
m
ano
M
e
r
g
e
g
it://git
.
kernel
.
org/
p
ub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
U
p
date
d
r
aft release
notes to 1
.
6
.
6
b
efore -rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
M
e
rge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Mer
g
e br
a
nch 'mm/maint-merge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
rg
e
br
a
nc
h
'jn/maint
-
p
u
ll-rebase-error-message' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
rg
e
branch 'j
k
/maint-add-p-
d
elete-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Merge git://g
i
t
.
bogom
i
ps
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Juni
o
C H
a
mano
Revert recent "git merg
e
<msg> HE
A
D <
c
ommit>
.
.
.
" depr
e
cation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
a
d
d-
i
nte
r
a
ctiv
e
: fix deletion of non-empty
f
iles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
S
Z
EDER Gábor
b
as
h
: upd
a
te 'git commit' co
m
pleti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Syn
c
wit
h
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
H
a
m
a
n
o
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
L
inus Torvald
s
Fix diff
-B/--dirsta
t
m
isc
o
unting of new
l
y added c
o
ntents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
e
ff King
res
e
t
: improve
worktree safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
T
odd Zullinger
Documenta
t
ion: Avoid use of xmlto --s
t
ringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
a
r
chi
v
e: clarify des
c
r
i
ption o
f
p
a
th paramete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
J
e
f
f K
i
ng
rer
e
r
e
: don't
segfault
o
n
failure to ope
n
rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge b
r
anch
'
m
aint'
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hama
n
o
Prepare
f
o
r
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
e
rge branch
'uk/mai
n
t-shortlo
g
-encoding'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
H
a
m
a
no
Merge b
r
anch 'fc/maint-format-p
a
tch-pathspec-da
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
e
rge bra
n
ch
'
ap/maint-
m
e
rge-strategy
-
list-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Merge b
r
anch 'jc
/
maint-am-keep' int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'rs/work-around-
g
re
p
-op
t
-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ham
a
no
Mer
g
e
b
r
a
n
ch 'rj/maint-cy
g
win-count-o
b
jects' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'm
m
/mai
n
t
-
hin
t
-
faile
d
-merge' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C H
a
mano
Merge b
r
anch 'th/maint-rem
o
te-upd
a
te-help
-
string' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
amano
Merge branch '
r
j/maint-t9700' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge bra
n
ch 'ls/maint-mailinfo-no-
i
nbo
d
y' i
n
to
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
aman
o
Merge branc
h
'
m
o/maint-crlf-doc'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hama
n
o
Merge branch 'th
/
remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Haman
o
Merge bran
c
h
'
p
b
/maint-use-cust
o
m-per
l
'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
e
rge bran
c
h
'mm/co
n
fig-
p
athname-tilde-expa
n
d' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C H
a
mano
Merge branch 'bc/grep-i-F
'
into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge
branch 'jk/m
a
i
nt-
b
re
a
k-
r
ename-reduce-mem
o
ry'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/m
a
int-simplify-cygw
i
n-ma
k
efile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge br
a
nch 'rg/doc-wo
r
kflow' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Mer
g
e branch 'np/main
t
-si
d
eb
a
nd-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Nar
e
bski
gitweb:
D
escribe (possible)
g
itweb
.
js minification
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Docu
m
entation:
x
mlto 0
.
0
.
18 does no
t
kn
o
w --stri
n
gparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
F
i
x crash
e
r on e
n
countering SHA1-li
k
e n
o
n
-n
o
t
e
i
n notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
don
Casey
t9
0
01
:
u
s
e
o
lder
G
etop
t
::Long b
o
olean prefix '--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t4201: use IS
O
88
5
9-1 rather than ISO-8859
-
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
p
ull: clarify advic
e
f
or t
h
e
u
nconfigured
error cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merg
e
in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
Git
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Unconditionally set man
.
base
.
url
.
fo
r
.
relative
.
link
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ha
m
ano
Merge
branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Documentation/
M
akefile: a
l
l
o
w
m
an
.
base
.
url
.
f
o
r
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Ha
m
an
o
Git 1
.
6
.
6
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
H
orst H
.
von Brand
git-p
u
ll
.
sh: Fix
call to git
-
merge for new command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepare for
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
amano
me
r
ge: do not add stan
d
ard mess
a
ge when message
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Do no
t
mi
s
identify "git
merge fo
o
HEAD"
as an
o
ld-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
i
o
C
Hamano
Update draf
t
release notes to
1
.
6
.
6 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Haman
o
Merge b
r
anch 'jc/deprecat
e
-old-syntax-fro
m
-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
g
it-
m
erge:
a
deprecation notice
o
f the ancient com
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next