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
mergetool: don't skip modify/remove conflicts
2011-02-16
Marti
n
von Zweigbergk
m
e
r
ge
t
ool
:
don't skip modif
y
/remove conflic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-16
Mar
t
i
n von Zweigbergk
rer
e
re "r
e
mai
n
in
g
"
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-05
Juni
o
C Hamano
Git 1
.
7
.
4
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-05
Junio C Ham
a
no
Merge
branch '
m
aint' to sync with 1
.
7
.
3
.
5
commit
|
commitdiff
|
tree
2011-01-05
Junio C
Hama
n
o
Git 1
.
7
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-05
Junio C H
a
m
a
no
M
e
rge b
r
anc
h
'jn
/
sv
n
-fe' (early part)
commit
|
commitdiff
|
tree
2011-01-05
Jun
i
o C
H
amano
Merge branc
h
'a
o
/t9
0
01-fix'
commit
|
commitdiff
|
tree
2011-01-05
Ju
n
i
o C Hamano
M
er
g
e branch
'
pw/convert-pathname-substitution'
commit
|
commitdiff
|
tree
2011-01-05
Ju
n
io C Hamano
M
e
rg
e
branc
h
'mg/cv
s
impo
r
t'
commit
|
commitdiff
|
tree
2011-01-04
A
n
tonio
Os
p
ite
t/t900
1
-send-email
.
sh
:
fix '&&' chain in some t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Michael
J
Gruber
c
v
simp
o
rt: handle the parsing of uppercase c
o
nfig optio
n
s
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Juni
o
C Hamano
Merge b
r
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2011-01-04
Jonathan Ni
e
d
e
r
d
a
emon: s
u
p
p
o
rt <directory> ar
g
uments ag
a
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
Ralf Wildenhues
Fix typ
o
s i
n
the documentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-04
J
onathan Nieder
gi
t
web: skip logo
i
n ato
m
fee
d
when there
is none
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-29
Rob
i
n
H
.
Johnson
t
90
0
1:
Fix test prereq
u
isites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Junio C Haman
o
Git
1
.
7
.
4
-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Junio C Hamano
Merge b
r
anch
'
mai
n
t'
commit
|
commitdiff
|
tree
2010-12-28
Junio
C Haman
o
Prepare for 1
.
7
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Junio C Hamano
Merg
e
b
ranch 'jk/commit-die-on-bo
g
us-iden
t
' into ma
i
nt
commit
|
commitdiff
|
tree
2010-12-28
Junio C
H
amano
Merge bran
c
h
'ks
/
b
lame-worktree-textconv-cached' into
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
J
u
nio C Hama
n
o
Merge branch 'jc/maint-
r
ebase
-
rewrite-last-skip' into
.
.
.
commit
|
commitdiff
|
tree
2010-12-28
Juni
o
C Ha
m
ano
Merge branch 'jc/ma
i
n
t
-a
m
-ab
o
rt-safely'
i
nto m
a
int
commit
|
commitdiff
|
tree
2010-12-28
Ju
n
io C Hamano
Merge b
r
anch
'
k
b/maint-
s
tatus-cquote' into m
a
int
commit
|
commitdiff
|
tree
2010-12-28
Brandon Casey
t900
1
: use
ol
d
e
r
Getopt::Long boolea
n
p
r
efix '-
-
no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-28
Ju
n
io C Hamano
Merge bran
c
h 'jc/maint-rebase-
r
e
write-l
a
st-skip'
commit
|
commitdiff
|
tree
2010-12-28
J
u
nio C H
a
m
a
no
Mer
g
e bra
n
ch 'nd
/
s
etup'
commit
|
commitdiff
|
tree
2010-12-28
Robin H
.
Jo
h
nson
F
ix false
p
ositives i
n
t3404 d
u
e
to S
H
E
LL=/bin/false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-27
Nguyễn Thái Ngọc
D
uy
setup_work_tree: ad
j
ust
r
e
l
a
t
i
ve $GIT_
W
O
R
K_TRE
E
after
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-26
Ju
n
io
C Hamano
Merge br
a
nch 'rs/maint-diff-fd-leak' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-12-26
R
e
n
é
S
charfe
close file on e
r
ror in r
e
ad_mmfile
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-23
Ju
n
io C Hamano
Merge bra
n
ch 'rj/
m
aint-difftool-cygwin-worka
r
o
u
n
d'
commit
|
commitdiff
|
tree
2010-12-23
Junio C
H
a
mano
M
erge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2010-12-23
Brandon Casey
Ma
k
efile
:
add NO_FNMATCH_CASEFOLD to IRIX sectio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-23
Bran
d
on C
a
sey
test-lib
.
sh/test_d
e
code_color
(
)
: u
s
e
o
ctal not hex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-23
Junio C Hamano
rebase --skip:
c
o
r
rectly wrap-up
w
hen sk
i
pping the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Junio C
Hamano
t0
0
21: avoid gettin
g
f
i
lter killed
w
i
t
h SIGPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Junio C
H
a
mano
Me
r
ge
b
ranch 'rj/main
t
-test-fix
e
s'
commit
|
commitdiff
|
tree
2010-12-22
J
unio C Hamano
Merge branch 'jc/maint-
a
m-abort-safely
'
commit
|
commitdiff
|
tree
2010-12-22
Junio
C
Hamano
Merge branch
'
jk/commit-die-on-bogus-ident'
commit
|
commitdiff
|
tree
2010-12-22
Juni
o
C Hamano
M
e
r
ge bra
n
ch 'pd/b
a
sh-4-completion'
commit
|
commitdiff
|
tree
2010-12-22
J
unio C
H
amano
Merge b
r
anch '
n
d/maint-fi
x
-
add-typo-detection'
commit
|
commitdiff
|
tree
2010-12-22
Junio C Hamano
Merge bra
n
c
h
'tf/co
m
mit-l
i
st-prefix'
commit
|
commitdiff
|
tree
2010-12-22
Ngu
y
ễn
Thái Ngọc Duy
git
.
txt:
c
orrect where --wor
k
-tree path is
relative
t
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Ngu
y
ễn Thái Ngọc Duy
Revert "Document
a
tion: always respect c
o
re
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Jonathan Nieder
t0001: test git init
w
hen run via a
n
a
l
i
as
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái N
g
ọc Duy
Remove all l
o
gic
fr
o
m get_git_work_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
N
guyễn Thái
N
g
ọ
c Duy
setup
:
rewor
k
setup_expl
i
cit_g
i
t
_
dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái Ngọc Duy
s
etup: c
l
ean up setup_
d
iscovere
d
_git_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Michael J Gruber
t
1
0
2
0-subdirectory: test alias
e
xp
a
nsion in
a
subd
i
rectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễ
n
Thái Ng
ọ
c Duy
setup
:
cle
a
n u
p
s
etup_bare_git_
d
ir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn
Thái Ngọc Duy
s
e
tup: limit
get_git_work_tree()'s to explicit setup
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguyễn Thái Ngọc Duy
Use git_co
n
f
i
g
_early
(
)
instead of g
i
t_config() during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
Nguy
ễ
n Thái Ngọc Duy
Add
g
i
t_config_early()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-22
P
e
t
e Wyckoff
convert filter:
supply
path to external
d
r
iver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-12-21
J
u
nio
C
H
a
m
ano
Merge branch '
k
s/blame-work
t
ree-textco
n
v-cached'
commit
|
commitdiff
|
tree
2010-12-21
Junio C
Hamano
Merge br
a
n
c
h
'
jk/t2107-now-passes'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Ha
m
ano
Merge bran
c
h
'jk
/
maint-decorat
e
-01-bool'
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hamano
Merge branch '
t
c/complet
i
on-re
f
lo
g
'
commit
|
commitdiff
|
tree
2010-12-21
J
u
nio C Hamano
Merge
branch 'nd/onel
i
ne-sha1-name
-
f
ro
m
-sp
e
cific-ref'
commit
|
commitdiff
|
tree
2010-12-21
Junio C
Hamano
M
erge branch 'jn/maint-g
i
tweb-pathinfo
-
fix'
commit
|
commitdiff
|
tree
2010-12-21
J
onat
h
an
N
ie
d
er
t0050: fix pr
i
ntf
format strings fo
r
por
t
ability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
R
amsay Jones
t3419
-
*
.
sh
:
Fix arithmetic exp
a
nsion syntax err
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Ju
n
io C Hamano
am --ab
o
rt: keep u
n
r
elated com
m
i
ts since the l
a
st f
a
ilure
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Junio
C
H
amano
set
_
t
r
y_to_
f
ree_routine(NULL)
means "do
not
h
i
ng special"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Junio C Hamano
commit: die before asking to edit
t
he log message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-21
Martin
von Zw
e
igb
e
rgk
co
m
p
letion: add missing co
n
figuration variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-20
J
e
ff King
ident: die on bogus date format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-20
Kirill S
m
elkov
fill_textconv(): Don't get/put c
a
c
h
e if s
h
a1 is
n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-20
Kirill Sme
l
kov
t/t8006: Demonstrate blame is broken when cache
t
extconv
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-20
Junio C Hamano
M
e
r
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-12-19
Jonat
h
an Nieder
t
9300: use p
e
rl "head -c" clo
n
e in place of "dd bs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Je
f
f
K
ing
t21
0
7
:
mark
passing
t
e
s
t as su
c
cess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
handle
a
rbitrary ints
i
n
git_co
n
fig_mayb
e
_boo
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Thiag
o
Fa
r
ina
bu
i
ltin/rm
.
c: Use ALLOC_GROW i
n
stead of allo
c
_nr a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
T
hiago Farina
buil
t
in/branch
.
c
:
U
s
e
ALLOC_GR
O
W instead o
f
alloc
_
nr
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Jakub Narebsk
i
g
i
tw
e
b:
Incl
u
de li
n
k
s to feed
s
in HTML h
e
ader only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
M
ark
L
odato
fsck docs: remove outdated and
us
e
less d
i
agnostic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-19
Th
o
mas Ras
t
userdiff: fix ty
p
o in ru
b
y and python w
o
rd regexes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
Vasyl' Vavrychuk
trace
.
c: mar
k
file
-
local function st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
Tay Ray Chuan
bash completion: add basic s
u
pport for g
i
t-reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
Jiang X
i
n
Fix typo in git-gc document
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
Junio C Hamano
Update d
r
a
f
t rel
e
ase notes to 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-17
J
uni
o
C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-12-16
Nguyễn Thái N
g
ọc Duy
g
et_sha1: handle special c
a
se $commit^{/}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-16
Michael J Gru
b
e
r
d
ifftool:
p
rovide basename to exte
r
n
a
l tools
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-16
M
i
c
hael J Gruber
g
i
t-
d
i
fftool
.
txt: cor
r
e
ct the d
e
script
i
on o
f
$BA
S
E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merge branch '
k
b
/
diff-C-M-synon
y
m'
commit
|
commitdiff
|
tree
2010-12-16
Junio
C
Hamano
M
e
rge branch 'j
n
/fast-i
m
port-blob-access'
commit
|
commitdiff
|
tree
2010-12-16
Ju
n
io
C
Haman
o
Merge branch 'jl/fe
t
ch-
s
u
b
m
odule-r
e
cursive
'
commit
|
commitdiff
|
tree
2010-12-16
Junio C
Hamano
M
e
r
ge branch
'rj/msvc-fix'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merg
e
b
ranch 'nd/exte
n
ded
-
s
h
a1-re
l
path'
commit
|
commitdiff
|
tree
2010-12-16
Juni
o
C Hamano
Merge branch 'a
a
/statu
s
-hil
i
te-bra
n
ch'
commit
|
commitdiff
|
tree
2010-12-16
Ju
n
io
C
Hamano
Merg
e
br
a
nch 'ak/d
e
scr
i
be-e
x
act'
commit
|
commitdiff
|
tree
2010-12-16
J
u
n
i
o
C Hamano
M
e
r
ge branch 'nd/mai
n
t-relative'
commit
|
commitdiff
|
tree
2010-12-16
Junio C
H
a
ma
n
o
Merge
b
ranch 'jn/main
t
-svn-f
e
'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Haman
o
Merge bran
c
h
'jc/
m
ain
t
-svn-info-tes
t
-fix'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Merg
e
branch
'
jn/submodule-b
-
curren
t
'
commit
|
commitdiff
|
tree
2010-12-16
Junio C Hamano
Me
r
ge branch
'jn/m
a
int-fast-i
m
port-object-reuse'
commit
|
commitdiff
|
tree
next