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
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
2008-09-23
Junio C Hamano
M
erg
e
br
a
n
ch 'bc/maint-diff-hunk-header-fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-21
Junio C Ha
m
ano
Merge
branch 'bc/
m
aint-d
i
ff-hu
n
k-heade
r
-
fix
'
into b
c
.
.
.
commit
|
commitdiff
|
tree
2008-09-20
J
unio
C Hamano
diff hunk p
a
ttern: fix misconverted "\{" tex ma
c
ro
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Jun
i
o C
H
am
a
no
diff: fix "multiple
r
egexp" semantics
t
o f
i
nd hunk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Ju
n
i
o
C Ham
a
n
o
di
f
f: use extende
d
regexp to f
i
nd hunk h
e
ader
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
J
unio C
Hamano
Merge branch '
b
c/main
t
-diff-hunk-header-fix' int
o
bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-20
J
u
n
io C
H
amano
diff:
use extended regex
p
to find hunk headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
J
u
nio
C Hamano
M
e
rge br
a
nch 'bc/m
a
int-d
i
ff-hunk-header
-
fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-12
J
uni
o
C
H
amano
GIT 1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-12
Junio C H
a
mano
Merge branch '
h
o/maint
-
dashless' into maint
commit
|
commitdiff
|
tree
2008-09-10
Junio C H
a
mano
U
p
date
d
r
aft release not
e
s for
1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-10
Junio C Hamano
Merge branch 'j
c
/m
a
in
t
-
l
og-grep' into
maint
commit
|
commitdiff
|
tree
2008-09-10
Ju
n
i
o
C Hamano
M
erg
e
branch 'jc/maint
-
hide-cr-
i
n-diff-from-less' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2008-09-10
Junio C Hamano
Merge branch 'jc/maint-check
o
ut-fix' i
n
to
maint
commit
|
commitdiff
|
tree
2008-09-10
Junio C Hamano
Merge branch 'np/
m
aint-safer-
p
a
ck'
i
n
t
o maint
commit
|
commitdiff
|
tree
2008-09-07
J
u
nio C H
a
mano
U
pdate draft re
l
e
ase
n
otes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Ha
m
ano
Merge
gi
t
://git
.
bogomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2008-09-07
J
uni
o
C
Ham
a
no
Merge updated git-gui and gitk that call each other
commit
|
commitdiff
|
tree
2008-09-06
Junio
C
Hamano
Merge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2008-09-06
J
unio
C
Hamano
Upda
t
e draft release notes
f
o
r
1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
J
u
nio C H
a
mano
stash
:
refresh the
i
ndex bef
o
r
e decidi
n
g
if
the work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
Junio C Hamano
Merge branch 'maint' of git
:
//r
e
po
.
o
r
.
c
z/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Junio C Hamano
Ment
i
on t
h
e
fact th
a
t 'git an
n
otate' is
o
nly for back
w
ard
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Junio C
H
amano
"
b
lame -c" s
h
ould be compatible w
i
th
"
a
n
n
otate
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Juni
o
C H
a
mano
Merge
branch 'jc/maint-
l
og-grep'
commit
|
commitdiff
|
tree
2008-09-05
Juni
o
C Hamano
log --autho
r
/--committer:
really match
o
nly wit
h
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Jun
i
o C Hamano
diff
-
-cumula
t
iv
e
is a sub-opt
i
on of --dirstat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Junio C H
a
mano
Update draft releas
e
notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Junio C
Hamano
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
S
tart 1
.
6
.
0
.
2
m
ain
t
e
n
an
c
e c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
J
u
n
io C Hamano
Merge branch 'nd/worktree' into maint
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o
C Hamano
Merge branch 'ho/dashless'
i
n
to maint
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hama
n
o
Me
r
ge
b
ran
c
h
'tr/filter-branch
'
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
io C Ha
m
ano
Merge branch 'np/
m
aint-s
a
fer-
p
ack'
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o
C Hamano
M
e
rge branc
h
'rf/man-env'
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o C Hamano
Merge
b
ranch 'jc/author-
n
ickname
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge br
a
nch '
d
p/pid-u
i
ntmax'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
Merge branch '
t
r/rev-lis
t
-
d
o
cs' int
o
t
r
/fi
l
t
e
r
-
branc
h
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Ha
m
ano
Mer
g
e
bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
a
m
a
no
'git f
o
o' pr
o
g
ram i
d
entif
i
es its
e
lf wi
t
hout
dash i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Haman
o
git commit
--aut
h
or=$n
a
me:
l
oo
k
$nam
e
up in existing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
no
diff: H
e
l
p
"less" hide ^M from t
h
e output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Hamano
gitattr
i
butes: -c
r
lf
i
s not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
checkout: do not check out unmerged higher
s
tages ra
n
doml
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge br
a
nch 'jc/post-simplify'
(early part) in
t
o
tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
g
i
t-apply: Loosen "m
a
tch
_
beginn
i
ng
"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
F
ix exa
m
ple in git-n
a
me
-
rev doc
u
mentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ham
a
no
Merge branc
h
'
sp/
m
issin
g
-thin-bas
e
' into maint
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
i
o C
Hamano
M
erge branch 'sb/daemon'
commit
|
commitdiff
|
tree
2008-08-30
J
u
n
i
o C Ham
a
no
Merge
b
ranch 'af/maint-install
-
no-hand
l
ink' into maint
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C Hamano
she
l
l: do n
o
t p
l
ay dupli
c
ated defi
n
ition g
a
me
s
to shr
i
nk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C Hamano
M
e
r
ge branch 'np/
v
erify-pack' into mai
n
t
commit
|
commitdiff
|
tree
2008-08-29
Ju
n
io
C
Hamano
Mer
g
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Ha
m
ano
Merge bra
n
ch 'mv/merge-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Merg
e
branch 'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
Merge
bran
c
h '
a
m/cherry-pick-rerere
'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Merge branch 'jc/add-a
d
dremove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
Hamano
Merge bra
n
ch 'np/verify-p
a
ck'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Me
r
ge
branch
'
d
a/submodule-
s
ync'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
Merg
e
bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
cty
p
e
.
c:
p
ro
t
ect t
i
ny
C
preprocessor constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Hamano
Merge branch 'af/m
a
in
t
-install-
n
o-handlink
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branc
h
'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-26
Junio
C
Hamano
daemon
.
c: minor style fixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
R
e
v
ert "Buil
d
-in
"
g
i
t
-s
h
ell""
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge
b
ran
c
h
'jc/no
-
slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
H
amano
Merge br
a
nch 'maint' to syn
c
wit
h
1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C
H
amano
GIT
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Ha
m
ano
Merge br
a
nch
'ag/maint-combi
n
e-dif
f
-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch 'mv/
m
aint-m
e
rge-
f
i
x'
i
nto maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
t7606: fix custom merge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C
H
a
m
ano
Mer
g
e bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
amano
merg
e
: fix nu
m
e
ru
s
bugs
a
r
ound "trivial merge
"
a
rea
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
unpack
_
trees(): pr
o
te
c
t
t
he handcrafte
d
in-core i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
t
e
mpla
t
es/Makefile: install is unnecessary,
jus
t
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge branch
'
maint
'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Ham
a
no
M
e
rge branch
'
ml/submo
d
ule
-
foreac
h
'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Merge branc
h
'p
m
/l
o
g-exit-code
'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Me
r
ge
b
ranch 'sb/commit-tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C
Hamano
Merge br
a
nch 'pb/
r
e
flog
-
dwim'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio
C Hamano
Mer
g
e bran
c
h 'jc/add-stop-at-sy
m
link'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merge branch 'k
h
/
d
iff-t
r
ee'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Merge branch 'mg/co
u
nt
-
o
b
jects'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
M
erge branch 'mz
/
push-verbo
s
e'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
Merg
e
branch 'jc/i
n
de
x
-extended-flags'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o
C Hamano
Merge bran
c
h 'c
c
/mer
g
e-base-m
a
n
y
'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Hamano
Merge branch
'jc/test-deeper
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
m
a
no
Merge branch 'j
s
/parallel-test'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Fix "git-merge -s bogo
"
help tex
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
unio C Hamano
Update dr
a
ft
release notes for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Update draft r
e
l
ease notes for 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Jun
i
o C Hamano
"git-merge": allow f
a
st-f
o
rwarding in
a stat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
J
u
nio C Ha
m
ano
completio
n
: find
o
u
t supported merge strategie
s
correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Juni
o
C
Hamano
for-each-ref: cope
wit
h
tags with i
n
com
p
lete lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio
C
Haman
o
dif
f
-
-
check: do not get confused by new blank lines
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-20
Junio C Hamano
Build-in "git
-
shell"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next