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
checkout -m path: fix recreating conflicts
2010-01-06
Juni
o
C Haman
o
checkout -m path: fix recreati
n
g conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
GI
T
1
.
6
.
1
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Haman
o
Include git-gui--askpass in git-gui RPM packa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Ju
n
io C
Hamano
Merge git://git
.
kernel
.
org/pub/scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2008-12-01
Juni
o
C
Hamano
Merge git://repo
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2008-12-01
Junio C H
a
mano
send-e
m
ail: do
not reverse the comma
n
d
line argum
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-01
Junio C
H
amano
Upd
a
te draft
re
l
e
a
se
n
otes to
1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio
C H
a
mano
Merg
e
bran
c
h
'st/m
a
int-tag' int
o
maint
commit
|
commitdiff
|
tree
2008-12-01
Junio
C Hamano
Merge
b
r
an
c
h '
m
k
/maint-cg-
p
ush' int
o
maint
commit
|
commitdiff
|
tree
2008-11-28
J
unio C
H
amano
Merge branch 'cc/bisec
t
-skip'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Ham
a
no
Merge
bran
c
h
'
j
s/m
i
ngw-rename-fix'
commit
|
commitdiff
|
tree
2008-11-28
Junio C
H
amano
Merge bra
n
ch 'st/l
e
v
enshtei
n
'
commit
|
commitdiff
|
tree
2008-11-28
Junio
C Hamano
Merg
e
b
ranch 'cr/remote-u
p
d
a
te-v'
commit
|
commitdiff
|
tree
2008-11-28
Junio
C Haman
o
M
e
r
ge branch
'rs/strbu
f
-expan
d
'
commit
|
commitdiff
|
tree
2008-11-28
J
u
nio C
H
a
man
o
Merge bra
n
ch 'mv/clon
e
-strbuf'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch
'
lt/pre
l
o
a
d
-
l
stat
'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Haman
o
Merg
e
branch
'
t
a
/qu
i
et-pull'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'ph/send-email'
commit
|
commitdiff
|
tree
2008-11-28
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
M
erge branch 'mv/fast-ex
p
ort' in
t
o maint
commit
|
commitdiff
|
tree
2008-11-27
Junio C Hamano
M
erge br
a
nch
'pw/maint
-
p
4'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2008-11-27
Junio C Hamano
Merge branch 'rw/
m
ai
n
t-typofix' into rw/t
y
p
o
fix
commit
|
commitdiff
|
tree
2008-11-26
J
u
nio C H
a
mano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2008-11-26
J
u
nio C
Hamano
Merge
b
ranch
'
m
m
/sort-confi
g
-doc
'
commit
|
commitdiff
|
tree
2008-11-26
J
unio
C
H
a
ma
n
o
Merge branch '
m
m/ma
i
nt
-
sort-config-
d
o
c' in
t
o
maint
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Merg
e
branch
'
mm/maint-
s
ort-co
n
fig-do
c
' into mm/sort
.
.
.
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Teach "git
d
i
ff" to honour
-
-[no
-
]ext-diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Me
r
ge branch 'for-junio' of git:/
/
source
.
w
i
nehq
.
org
.
.
.
commit
|
commitdiff
|
tree
2008-11-24
Junio
C
Hamano
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-11-17
Jun
i
o C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-11-17
Junio C Haman
o
builtin-remote
.
c:
plug a small memory leak in
g
et_one_remot
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-16
Junio C
Hamano
M
erge
git://repo
.
o
r
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2008-11-16
Ju
n
i
o C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-11-16
Ju
n
io C H
a
man
o
Me
r
ge branch 'bc/m
a
int-keep-pack'
commit
|
commitdiff
|
tree
2008-11-16
Junio
C Hamano
Merge branch '
j
k/c
o
m
m
it-v-strip'
commit
|
commitdiff
|
tree
2008-11-16
Junio
C Hamano
Tea
c
h
ls
-
files --with-tre
e
=<tree> to work
w
i
th
options
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-16
Junio C Hamano
b
u
ilt
i
n
-ls-files
.
c: coding style fix
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-15
Junio C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-14
Ju
n
io C Hama
n
o
Me
r
ge git://git
.
bog
o
mips
.
org/git-svn
commit
|
commitdiff
|
tree
2008-11-14
J
u
ni
o
C Haman
o
Mer
g
e
g
i
t
://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2008-11-14
Juni
o
C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-11-13
J
u
nio C Hamano
M
e
rge git://git
.
kernel
.
o
r
g/
p
ub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2008-11-13
J
u
nio C Hamano
Update d
r
af
t
release not
e
s to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-13
Junio
C
Hamano
M
erge branch 'jn/gi
t
web-customlinks'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch
'gb/gitweb-snap
s
hot-p
a
thinfo'
commit
|
commitdiff
|
tree
2008-11-13
Junio C
Hamano
Merge
branch '
d
s/uintmax-config' (
e
arly part)
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Me
r
ge branch 'jk/maint-commit-v-strip'
commit
|
commitdiff
|
tree
2008-11-13
Jun
i
o C Hamano
M
er
g
e branch 'np
/
pa
c
k
-safer'
commit
|
commitdiff
|
tree
2008-11-13
Ju
n
io C Hamano
M
erge branch 'mk/maint-cg-
p
ush'
commit
|
commitdiff
|
tree
2008-11-13
Juni
o
C Hamano
Merg
e
branch 'bc/maint-keep
-
pack'
commit
|
commitdiff
|
tree
2008-11-13
Junio
C Hamano
Merge
b
ranch '
m
v/r
e
mote-rename'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Ha
m
ano
Merge
b
ranch 'j
k
/deny
-
push-to-
c
urrent'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
M
e
rge bra
n
ch '
d
l
/xdiff'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'lt/decora
t
e'
commit
|
commitdiff
|
tree
2008-11-13
Ju
n
io
C
Ham
a
no
Merge branch 'j
k
/diff-c
o
nvfilter'
commit
|
commitdiff
|
tree
2008-11-13
Ju
n
io
C
H
amano
Merge branch 'jk/diff-convfi
l
ter-t
e
s
t
-f
i
x'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Ha
m
ano
Merge branc
h
'st/tag'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Me
r
ge g
i
t
:
//re
p
o
.
o
r
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2008-11-12
Jun
i
o C
Hamano
git
.
html: Updat
e
the links t
o
stale versions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Junio C H
a
mano
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-11-12
Junio
C
Hamano
Start 1
.
6
.
0
.
5 c
y
c
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Junio C Hamano
checkout: Fix "initi
a
l ch
e
ckout" det
e
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Junio C Hamano
Merge
b
r
anch 'jk
/
mai
n
t-commit-v-strip'
i
nto jk/
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2008-11-11
J
unio C Ha
m
ano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-11-11
Junio C Hamano
Makefile: help people who
r
un 'make check' b
y
mist
a
ke
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Haman
o
t530
3
: fix p
r
intf format string for portabi
l
i
ty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Ju
n
io C
H
amano
t5303: work aro
u
nd pr
i
ntf bre
a
kage in
dash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
J
uni
o
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-09
Junio
C Haman
o
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
G
IT 1
.
6
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
J
unio C Ha
m
ano
Merge b
r
anch 'cb/maint-update-ref-fix' into
m
aint
commit
|
commitdiff
|
tree
2008-11-09
Junio
C
Ha
m
a
no
Merge bran
c
h 'cj
/
maint
-
gi
t
pm-f
i
x-ma
y
be-self'
into maint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Mer
g
e bra
n
ch 'ar/maint-mksnpath'
into main
t
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch '
m
v/maint-branch-m-symref' into maint
commit
|
commitdiff
|
tree
2008-11-09
Ju
n
io C Ha
m
ano
Mer
g
e branch
'
ds/autoc
o
nf'
commit
|
commitdiff
|
tree
2008-11-09
J
u
n
i
o C Hamano
Merge bran
c
h '
r
s
/blame'
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hamano
Update dra
f
t release notes
t
o
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hamano
Me
r
g
e
b
ranch 'ar/m
k
snpath'
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hama
n
o
Merge branch 'jc/gitweb-fix-cloud
-
tag'
commit
|
commitdiff
|
tree
2008-11-05
Junio C
H
am
a
no
M
e
rge branch 'mv/main
t
-branch-m-symref'
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hamano
Merge branch 'mv/pa
r
seo
p
t-checkout-index'
commit
|
commitdiff
|
tree
2008-11-04
Junio C Ha
m
ano
Merge branch
'm
a
int'
commit
|
commitdiff
|
tree
2008-11-03
Junio C
H
amano
f
o
rmat-pa
t
ch document
a
tion: menti
o
n the spec
i
a
l
case
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-03
J
u
nio C Hama
n
o
Update draft releas
e
n
o
tes to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
Merg
e
b
r
an
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2008-11-03
Jun
i
o C Hama
n
o
Mer
g
e
bran
c
h 'np/index-
p
ac
k
'
commit
|
commitdiff
|
tree
2008-11-03
Ju
n
io C Ha
m
ano
Merg
e
branch 'sh
/
rebase-i-p'
commit
|
commitdiff
|
tree
2008-11-03
Ju
n
io C Hamano
Merge branch
'ag/blame-encoding'
commit
|
commitdiff
|
tree
2008-11-03
J
u
nio
C
Hamano
Merge
b
ranch 'gb/gitweb-pathinfo'
commit
|
commitdiff
|
tree
2008-11-03
Juni
o
C
Hamano
Merge
b
r
anch 'cj/m
a
int-gitpm-fix-maybe-s
e
lf'
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Update draft 1
.
6
.
0
.
4 releas
e
no
t
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Junio C
H
amano
Merge branch 'j
s
/
maint-fetc
h
-
u
pd
a
te-
h
ead'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2008-11-02
Junio C H
a
mano
Merge
branch 'j
k
/maint-ls-files
-
other' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2008-11-02
Junio C
Hamano
Merge branch 'jc/maint-reset-remove-unmerged-new' into
.
.
.
commit
|
commitdiff
|
tree
2008-11-02
J
u
ni
o
C
H
amano
M
e
r
ge branch 'jc/maint-co-
t
rack
'
into
m
aint
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hama
n
o
Update draft release notes to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
J
unio C Hamano
Stop
u
sing compat/regex
.
c on platforms wi
t
h working
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Junio C H
a
mano
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Star
t
1
.
6
.
0
.
4
cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next