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
more D/F conflict tests
2010-01-04
Junio
C Hamano
more D/F co
n
flict tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
tests: m
o
ve convenien
c
e regexp
t
o match object names
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Ju
n
io C Ha
m
ano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
David Rei
s
s
Preven
t
git blame
from
s
egfaulting on a mi
s
sing au
t
hor
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
G
i
t
1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
rebase
-i: ab
o
rt cleanly if t
h
e editor fa
i
ls to launc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
technical-
d
ocs: document has
h
API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
api
-
s
trb
u
f
.
txt: fix
t
ypos
a
nd do
c
ument launch_edi
t
o
r
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
Merge branch 'maint' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
worktree: don'
t
segfau
l
t
w
ith an abso
l
ute paths
p
ec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
eff
King
ignore
u
n
k
nown color conf
i
guration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Joh
a
nnes
Sixt
help
.
autocorre
c
t: do not run a comm
a
nd if t
h
e comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nana
k
o Shiraishi
Il
l
u
s
trate "filter" attri
b
ute with an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Björ
n
Gu
s
tavsson
bash: Supp
o
rt
new 'git fetch' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Ha
m
ano
U
pdate Release Notes for 1
.
6
.
6 to rem
o
v
e
old bugfixe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio 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 Haman
o
G
i
t 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hama
n
o
Fix archive format with --
o
n th
e
command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
Haman
o
Rem
o
ve pos
t
-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Hamano
G
i
t 1
.
6
.
6-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Merge git://re
p
o
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Merge g
i
t://git
.
kernel
.
org/p
u
b/sc
m
/gitk
/
git
k
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io
C
Haman
o
Upd
a
t
e
draft relea
s
e
notes t
o
1
.
6
.
6 before
-
rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ha
m
ano
Merge bra
n
ch 'm
m
/maint-merge-f
f
-erro
r
-
m
essage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
r
ge branch 'jn/maint-pull
-
rebase-e
r
ror-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
Merge branch 'jk/maint-add-p
-
delet
e
-fix
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Merge git://git
.
bogomi
p
s
.
org/
g
it
-
svn
commit
|
commitdiff
|
tree
2009-12-08
J
unio C Hamano
Rever
t
recent "git mer
g
e <msg> HEAD <commit>
.
.
.
" dep
r
ecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
Jeff Kin
g
add-interactive: fix
d
eletio
n
of non-em
p
t
y
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
bash: up
d
ate '
g
i
t
c
o
mmit' c
o
mpletion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync w
i
th 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Ham
a
no
Git
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Li
n
us Torval
d
s
Fix diff -B/--dir
s
tat
miscounting of newly
added content
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
rese
t
: i
m
prove wor
k
tr
e
e safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Documentatio
n
: Avoid
use of
xmlto --str
i
ngparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
ar
c
hive: clarify de
s
crip
t
i
o
n of path parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
r
e
r
ere: d
o
n't se
g
f
a
ult on failure to ope
n
rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
Mer
g
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hama
n
o
Pre
p
are for
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
u
k
/maint-
s
hortlog-encoding' i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
e
rge branch 'fc/maint-form
a
t-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o C Hamano
Merge bra
n
ch 'ap/maint-merge-st
r
a
tegy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
Merge br
a
nch 'jc/maint-am-keep' into
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
n
ch 'rs/work-around-grep-opt-i
n
san
i
ty' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
Hamano
M
e
rge b
r
anch 'rj/maint-cygwin-count-
o
b
j
ects
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merg
e
b
r
anch '
m
m/maint-hi
n
t-failed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
H
amano
Merge branch 'th/maint-remote-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ham
a
no
Mer
g
e branch 'rj/maint-t9700' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
a
n
ch
'
ls/maint-mailinf
o
-no-inbody'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
Ha
m
ano
Mer
g
e branch
'mo/m
a
int-crl
f
-doc
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
erge
b
ranch '
t
h/r
e
mot
e
-usage'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merg
e
branch 'pb/maint-use-custom-
p
erl'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'm
m
/
c
onfig-pathna
m
e-
t
i
l
de-ex
p
and' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'bc/grep-i-F
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch
'j
k
/maint-break-rename
-
red
u
ce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Mer
g
e
bran
c
h
'rj/ma
i
n
t-simplify-cygw
i
n-makefile
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C
Hamano
Merge branch
'
rg
/
doc-
w
or
k
flow' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io
C Ha
m
a
no
M
erge branch 'n
p
/maint-s
i
deband-
f
avor-
s
tatus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jaku
b
Na
r
ebski
git
w
eb: Describe (
p
ossible) gitweb
.
js mini
f
icati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
a
mano
Documentatio
n
:
x
mlt
o
0
.
0
.
18 does not kno
w
--stringpara
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Johan
Her
l
a
n
d
F
i
x crashe
r
on e
n
c
o
u
n
t
ering
S
HA1-like
n
o
n
-note in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n
Casey
t9001: use older
G
etopt
:
:Long boolean p
r
efix '
-
-no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brando
n
Casey
t4201: us
e
ISO
8
859-1 rath
e
r than ISO
-
8
8
5
9-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull: clarif
y
adv
i
ce for the unconfigured
error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Hamano
Merge
i
n
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Unconditi
o
n
al
l
y set ma
n
.
base
.
ur
l
.
for
.
rel
a
tiv
e
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Mer
g
e b
r
anch
'm
a
in
t
'
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
D
ocumentation/Makefile: allow m
a
n
.
base
.
url
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git 1
.
6
.
6
-
r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von Brand
git-pull
.
sh: Fix call
to git
-
m
erge for new comm
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Me
r
ge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hamano
Prepare
f
o
r
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merge
:
do
n
ot add st
a
n
dard m
e
ssag
e
when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not misi
d
en
t
ify "git
merge foo HEAD" as an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
Hama
n
o
Update
dr
a
ft release notes to 1
.
6
.
6 be
f
ore -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o
C Ha
m
a
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io
C
Hamano
Mer
g
e br
a
nch
'jc/deprecate
-
o
l
d
-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
git-merge
:
a depreca
t
ion n
o
tice of the ancient comm
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
i
o
C Hama
n
o
M
erge
branc
h
'b
w
/remote-get
-
re
f
-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
B
ert W
e
sarg
g
e
t_r
e
f_states: s
t
rdup entries and free util in stale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help:
D
o
n
ot
un
n
ecessarily look
f
o
r a
r
epository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Document
a
tion: Fix
a
few i
.
e
.
/e
.
g
.
m
i
x-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
uni
o
C
H
amano
Merge br
a
n
ch
'
j
n/gitweb-bl
a
me'
commit
|
commitdiff
|
tree
2009-12-01
J
akub Narebs
k
i
gitwe
b
: Add l
i
nk t
o
o
ther blame i
m
p
l
em
e
ntation
in
blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ja
k
ub Narebs
k
i
gitweb: M
a
ke
linking to actions requiring JavaS
c
ript
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merge branch
'fc/
m
aint-format-patch-pathspec-dashes
'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C H
a
mano
Merge branc
h
'mm/ma
i
n
t-
m
e
rg
e
-ff-error-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
Hamano
Merge br
a
nc
h
'
ap/maint-me
r
ge-strategy-list-fix
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
b
ranch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io
C
H
amano
Merge branch
'cc/bisect-
d
oc
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o C
H
amano
Me
r
ge branch 'em/comm
i
t-cla
i
m'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
M
e
r
ge branch 'jc/mailin
f
o-remove-b
r
ackets
'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
H
am
a
no
M
e
rge
b
r
anch 'fc/s
e
nd-email-env
e
l
ope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
a
n
o
M
e
rge br
a
nch 'uk/
m
aint-sh
o
rtlog-enc
o
ding'
commit
|
commitdiff
|
tree
next