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
rerere: honor conflict-marker-size attribute
2010-01-17
Junio C Ham
a
n
o
r
e
rer
e
: honor conflic
t
-mark
e
r-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
r
ere
r
e: pre
p
are for customizable
c
onflic
t
marker
len
g
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
c
o
nfl
i
ct-marker-size:
n
ew
at
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
a
no
rerere:
u
se l
l
_merge() in
s
t
e
ad
o
f usi
n
g xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
merge-tree: use ll_merge() not
xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ha
m
ano
x
dl_
m
erge():
a
ll
o
w passing down marker_s
i
ze in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
xdl_
m
e
rge
(
)
:
introduce xmparam_t fo
r
merge specifi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
g
i
t_
a
ttr
(
): f
i
x f
u
nctio
n
si
g
natu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Ham
a
no
rerere forget
path: forget re
c
o
r
ded reso
l
utio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Ha
m
ano
r
e
r
e
re: refactor rerere log
i
c
t
o ma
k
e
it independen
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
rere
r
e: remove sil
l
y 1024-byte li
n
e limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
e
solve-u
n
do: teach "upd
a
te-
i
n
d
ex --unresolve" to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
resolve-und
o
: "
c
hec
k
out -m pat
h
" us
e
s resolve-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
res
o
l
ve-u
n
do:
a
l
l
o
w plumbing to clear the infor
m
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
re
s
o
lve-undo: ba
s
ic
te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
reso
l
ve-undo:
re
c
ord resolved
con
f
li
c
ts in a new in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
builtin-merge
.
c: use stand
a
rd acti
v
e_ca
c
he mac
r
o
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
J
unio
C
H
aman
o
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
David R
e
i
s
s
P
r
even
t
git bl
a
me
from segfaulti
n
g on a m
i
ssin
g
auth
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Haman
o
G
it 1
.
6
.
6-
r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
r
ebase -i: abor
t
cleanl
y
if the
e
d
i
tor fails to
launch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
S
t
ephen
B
oyd
tec
h
ni
c
al-docs:
document hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
Boy
d
api
-
s
t
r
buf
.
t
x
t: fix typos
and document l
a
unch_ed
i
to
r
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C H
a
m
ano
Merge branch 'maint' to sync
w
ith 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C H
a
mano
Gi
t
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
work
t
ree: don
'
t segfault w
i
th an
a
b
s
olute pat
h
spec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ign
o
re unk
n
o
wn color configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Si
x
t
help
.
autocorrect
:
do not run a command if the c
o
mmand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako
Shira
i
shi
Illustrate "filter" attribute with a
n
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björn
Gusta
v
sson
ba
s
h: Su
p
p
or
t
n
e
w 'git fetc
h
' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C Hamano
Updat
e
Release
Notes for 1
.
6
.
6 to remove old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
H
amano
Syn
c
with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
n
io C Ha
m
ano
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Fix
archive f
o
rmat with
-
- on the
command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
Remove post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
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
H
amano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
M
e
rge git://git
.
kernel
.
org/pub
/
scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Haman
o
Update dra
f
t release no
t
e
s
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
b
ra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merge branch
'mm/m
a
int-mer
g
e-ff-error-m
e
ss
a
ge-f
i
x
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Me
r
ge branch 'jn
/
maint-p
u
ll-rebase-error
-
message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
r
ge branch 'jk/ma
i
nt-add-p-delete-fix' in
t
o
main
t
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Me
r
ge git://git
.
bog
o
mips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hama
n
o
R
evert recent "git merge <msg> HEAD <
c
o
mmit>
.
.
.
" depr
e
cati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-i
n
t
e
ractive: fix deletion of non-empt
y
f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZEDE
R
Gábor
bash: update 'g
i
t commit' completion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
unio
C
Hamano
Syn
c
with
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 Torva
l
ds
F
i
x diff -B/--dirstat mi
s
counting of n
e
wly added
c
o
n
te
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
r
es
e
t: improve wo
r
ktree safety
v
alves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Documentation: Avoid use
o
f xmlto --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
archive: clarify de
s
c
ription
o
f
p
ath param
e
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff
King
rerere: don't segfaul
t
on
f
a
i
lure to open rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Prepare
f
or 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge br
a
n
ch 'uk/m
a
int-short
l
og-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge b
r
anch 'fc/m
a
int-format-pat
c
h-path
s
p
e
c
-
dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merg
e
branch 'ap/ma
i
nt-m
e
rge
-
s
t
rategy-list-fi
x
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
ano
M
e
rge
branc
h
'jc/
m
aint-a
m
-keep
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branch
'rs/work-around-gre
p
-opt-in
s
an
i
ty' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
mano
Merg
e
branch 'r
j
/maint-
c
ygwin-count-objects' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
e
rge
b
r
anch 'mm/maint-hint-failed-merge' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C H
a
ma
n
o
Mer
g
e br
a
n
c
h 't
h
/
m
aint-remot
e
-updat
e
-
h
e
l
p-s
t
rin
g
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
e
rge branch 'rj/maint-t
9
70
0
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
M
erge branch 'ls/mai
n
t-m
a
i
li
n
fo-no-inb
o
dy' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge
branch 'mo/maint-crlf
-
doc
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
an
o
Merge branch 'th/remote-usage'
into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hama
n
o
Me
r
ge branch 'pb/
m
aint-use-custo
m
-perl'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ham
a
no
Me
r
ge branch 'mm/
c
on
f
ig-path
n
a
me-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Merge branch 'bc/grep-i-F' into main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io
C
Ham
a
no
Merge
b
ranch 'jk
/
maint-
b
reak-rename-reduce
-
memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch 'rj/maint-sim
p
lify-
c
ygwin
-
ma
k
efile' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge bran
c
h 'rg/doc-workflow' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Merge branch
'
np/main
t
-sideband-
f
avor-statu
s
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Na
r
ebski
gitweb: Describe
(
possible) gitw
e
b
.
js minification
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
Hamano
Docu
m
entatio
n
: xmlt
o
0
.
0
.
18 does not know --
s
t
r
in
g
param
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix
c
rasher o
n
e
n
countering SHA1-like non-note i
n
note
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t9001
:
us
e
old
e
r Getopt:
:
Long
b
oolean prefix
'
--
n
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
d
on Case
y
t4201: use ISO8859-1
rather
t
h
an ISO-
8
859
-
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan
K
rüger
pull
:
clari
f
y advice fo
r
the unco
n
figured
e
r
r
o
r case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
erge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
G
i
t 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Hamano
Un
c
o
n
d
itio
n
a
l
ly set man
.
ba
s
e
.
url
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Do
c
umentatio
n
/Mak
e
file
:
allow
m
an
.
base
.
url
.
fo
r
.
re
l
ative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C
H
a
man
o
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
H
ors
t
H
.
von Br
a
n
d
g
it-p
u
ll
.
sh: Fix
c
all
t
o gi
t
-
m
erg
e
fo
r
new
command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
a
n
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
merge: do not add
standa
r
d
m
essage when message i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do n
o
t misidentify "git
m
erge foo HEAD" as an old-
s
tyle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update dra
f
t 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
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
Mer
g
e bra
n
ch '
j
c/deprecate-old
-
syntax-from-
m
erge'
commit
|
commitdiff
|
tree
2009-12-01
J
unio C
H
amano
git-merge: a depr
e
cation notice
o
f the a
n
cient com
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
a
m
ano
Merge bra
n
c
h
'b
w
/remote-get-ref-states-fix'
commit
|
commitdiff
|
tree
next