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
Merge branch 'maint' of git://git.spearce.org/git-gui into maint
2010-01-24
Junio C Hamano
Merge branch 'maint'
of git:
/
/git
.
spearce
.
o
r
g/git-
g
ui
.
.
.
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
ignore duplicated slashes in make
_
relative_path()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio
C Hamano
merge-recursive: do
not return NULL o
n
ly to cause
segfa
u
lt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
M
e
r
ge br
a
nch 'jc/maint
-
re
f
resh-index-is
-
optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'bg
/
maint-remote-u
p
date-
d
e
f
ault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'sb/maint-oc
t
o
pu
s
' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
branch 'b
g
/
m
aint-a
d
d-all-doc' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
ano
Merge branch 'main
t
-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'j
k
/maint-1
.
6
.
5-reset-hard' int
o
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'tr/ma
i
nt-1
.
6
.
5-bash-p
r
o
mpt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge bra
n
c
h 'dp/ma
i
nt-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge br
a
nch 'jm/main
t
-1
.
6
.
5-grep-NUL-term
i
nate'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
status: do
n
't r
e
quire the repository to be w
r
i
t
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
amano
Merge
b
ranch 'maint-
1
.
6
.
4'
int
o
m
a
int-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merg
e
bran
c
h 'maint
-
1
.
6
.
3' int
o
m
aint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Me
r
ge bra
n
ch 'ma
i
nt-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
M
e
rge commi
t
'
v
1
.
6
.
4
.
4-8-g8de6518'
into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
m
ano
Fix mis-
b
ackport of
t
70
0
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update draft
r
elease
n
o
t
es to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C
Hamano
Merge branch 'dp/maint-1
.
6
.
5
-
f
as
t
-
import-non
-
c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merg
e
bran
c
h 'jm/maint-1
.
6
.
5-grep-N
U
L-ter
m
i
n
ate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hamano
grep: -L should
show empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Hamano
M
erge
branch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
erge branch 'maint-1
.
6
.
1' into maint
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merg
e
branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio C
H
amano
checkout -m: do
n
ot try to fall back to --merge from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
Jun
i
o C Hamano
M
erge
b
r
a
n
ch 'm
a
int
-
1
.
6
.
0
' into m
a
int
commit
|
commitdiff
|
tree
2009-12-30
Ju
n
io
C
H
a
m
a
n
o
Merge b
r
anch
'
maint-1
.
6
.
1'
i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-30
Junio C Haman
o
Merge branch 'maint-1
.
6
.
0'
into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-27
Juni
o
C Hama
n
o
Merge
bran
c
h
'
n
f
/
ma
i
n
t
-fix-inde
x
-ext-len-on-
b
e64' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Hamano
Makef
i
l
e
: FreeBSD (both 7
a
n
d
8) needs OLD_ICONV
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C
H
amano
Start 1
.
6
.
6
.
X
m
a
i
ntenan
c
e track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Hamano
Merge
b
ranch 'jc/mai
n
t-obsd46' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
t4019 "grep" portability
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C
H
amano
t1200: work
a
roun
d
a bug in s
o
me im
p
lementati
o
ns of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio
C H
a
mano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-20
Jun
i
o C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Haman
o
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
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 Hamano
M
erge branch 'maint'
t
o s
y
n
c
wi
t
h
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
i
o
C
H
amano
worktree: don't segfault
w
ith an absolute pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Rele
a
se
N
otes for 1
.
6
.
6 to rem
o
ve old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C Hamano
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
Hamano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C
Hamano
Fix archiv
e
f
o
r
m
at with -- on
th
e
command
line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remove po
s
t-upload-ho
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ha
m
ano
G
it 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Merge git://rep
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge g
i
t
://
g
it
.
ke
r
n
el
.
org/pub/scm
/
g
itk/gi
t
k
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Update
draft release note
s
to 1
.
6
.
6 b
e
fore -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
n
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Haman
o
Merge branch '
m
m/
m
a
int-merg
e
-ff-error-mess
a
ge-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C
Ha
m
a
n
o
Merge b
r
an
c
h 'jn
/
ma
i
nt-pull-rebase-error-mess
a
ge'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
i
o C Hamano
Merg
e
br
a
nch 'jk/maint-add-p-delete-
f
ix
'
into maint
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Merge g
i
t:/
/
g
i
t
.
bogomips
.
o
r
g
/git-s
v
n
commit
|
commitdiff
|
tree
2009-12-08
J
u
nio C Ham
a
no
Revert rec
e
nt
"
g
it merge <msg>
HEA
D
<commit>
.
.
.
" d
e
p
r
ecat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Hamano
Sync
w
ith 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-03
Ju
n
io C Hama
n
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Prepare for
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C
Hamano
Merge branch 'uk/mai
n
t-sh
o
rtlo
g
-enc
o
ding
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'f
c
/maint-format
-
p
a
tc
h
-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
Hamano
Merge bra
n
ch 'ap/maint-me
r
g
e
-
s
t
rate
g
y-list-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Me
r
g
e branch 'jc/maint-am-keep'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'rs/work-aro
u
nd-grep
-
opt-insanity'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
erg
e
bra
n
ch 'r
j
/
maint
-
cygwin-count-objects'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o C Hama
n
o
Merge br
a
n
ch
'
mm/mai
n
t-hint
-
faile
d
-
merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hama
n
o
M
e
rge branch 'th
/
m
ai
n
t
-
remot
e
-update-help-
s
tring' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
H
aman
o
Mer
g
e branch '
r
j/
m
a
i
n
t-
t
9700' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
ama
n
o
Merge
branch 'l
s
/
m
aint-mailinfo-no-inbody' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'mo/main
t
-crlf-
d
oc' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'th/
r
emote-usage' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge bran
c
h
'p
b
/maint-use-custom-
p
erl' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Hama
n
o
Merge br
a
nch 'mm/conf
i
g
-p
a
thna
m
e-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
erge bra
n
ch
'
b
c
/
g
rep-i-F'
in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C Hamano
M
e
rge branc
h
'jk/maint-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
Hamano
Merge
branch 'rj/maint-simplify-cygwi
n
-make
f
ile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
aman
o
Merge branch
'
r
g/
d
o
c
-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
a
m
ano
Merge
b
ranc
h
'np/ma
i
nt-
s
ideband-
f
avor-status' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Documentation:
xmlto 0
.
0
.
18 do
e
s
n
o
t know --stringp
a
ram
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
mano
M
e
rge 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
Junio C Hama
n
o
U
n
conditionally set
m
an
.
b
ase
.
ur
l
.
for
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
io C Hamano
Git 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Hamano
Mer
g
e branch '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
Junio C H
a
mano
merge: do
n
ot add
stan
d
ard message when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Haman
o
Do n
o
t
m
isid
e
ntify "git
m
erge foo HEAD
"
as an old-st
y
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Haman
o
Up
d
a
t
e
draft re
l
ease notes
t
o 1
.
6
.
6
before
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C
H
amano
Merge branch 'jc/deprec
a
te-old-s
y
ntax
-
f
r
om-mer
g
e
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
git-merge: a d
e
pr
e
cation
n
otice of
the ancient comma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
ni
o
C Hama
n
o
Merge bra
n
c
h 'bw/re
m
ote-get-ref-states
-
f
ix'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
M
e
rge b
r
anch 'jn/g
i
twe
b
-
b
lame
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
ni
o
C
Hamano
Merge branc
h
'fc/maint-format-patch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'mm/
m
aint-merge-ff-error-mess
a
ge-
f
ix
'
commit
|
commitdiff
|
tree
next