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 'fc/rerere-conflict-style' into maint
2014-06-25
Junio C
Ham
a
no
Mer
g
e br
a
nch '
f
c/rer
e
re-
c
onflict-sty
l
e
'
into m
a
int
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io C Ha
m
a
n
o
Merge
branch '
r
s/pack-
o
bjects-no-
u
n
n
ecessary-rea
l
loc
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio
C
Haman
o
Merge branch 'dt/merge-rec
u
rs
i
ve-case-insensit
i
ve'
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hama
n
o
Merge
b
ranc
h
'rs/m
a
ilinfo-
h
eader-cmp' into maint
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C
Hamano
Merge branch 'jk
/
index-
p
ack-report-mis
s
ing' i
n
t
o maint
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C
Hamano
Merge branch '
n
d
/
index-pack-one
-
fd-per-thread' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C Hamano
Merge branch 'sk/spawn-les
s
-
c
ase-insensiti
v
ely-from
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hama
n
o
Merge branch 'n
d
/daemonize
-
g
c
' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge b
r
a
nch
'jk/diff-follow-must-take-one
-
pathspec
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge
branch '
j
k/diff-f
i
l
es-assume-unchanged' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge branch 'jk/commit
-
C-pick-empty' into mai
n
t
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ham
a
no
Mer
g
e branch
'bc/blame-crlf-test' into
m
a
int
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge b
r
anc
h
'j
x
/blame-align-relative-time' int
o
maint
commit
|
commitdiff
|
tree
2014-06-25
J
u
n
i
o
C
Haman
o
M
e
r
ge
bra
n
ch 'j
c
/apply-
i
gn
o
re-w
h
i
t
esp
a
ce' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge br
a
nch
'jk/comp
l
ete-m
e
rge-pu
l
l'
i
nto m
a
int
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C Hamano
Merg
e
br
a
nch '
o
w/config-mailma
p
-p
a
thname' in
t
o
m
aint
commit
|
commitdiff
|
tree
2014-06-25
Junio C
H
a
man
o
Merge br
a
nch 'a
s
/pretty-t
r
uncate' into maint
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C H
a
mano
Merge branch
'
j
c/revision-
d
ash-c
o
unt-p
a
rsin
g
' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ha
m
ano
M
erge
b
ranch 'jk/re
p
o
r
t-fail-to-
r
ead-objects-better
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
J
unio C
Ham
a
no
Merge bra
n
ch 'mn/sideband-no-
a
nsi' int
o
maint
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio C
Hama
n
o
Me
r
g
e branch 'je/pager-d
o
-
n
ot
-
rec
u
rse' into
m
ain
t
commit
|
commitdiff
|
tree
2014-06-12
Junio C
Hamano
M
erge branch 'jc/rev-parse-argh-dashe
d
-mu
l
ti-words
.
.
.
commit
|
commitdiff
|
tree
2014-06-12
Jacek Konie
c
zny
pull: do not a
b
us
e
'b
r
eak' inside
a she
l
l 'cas
e
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-09
Junio C
H
a
mano
revision: parse "git log -<count>" more ca
r
efully
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-04
Jeff King
update-index
:
f
i
x
s
egfau
l
t wi
t
h missing
--ca
c
heinfo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-02
René Scharfe
pack
-
objec
t
s: use free
(
)+xcall
o
c() instead of
x
realloc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-02
René Scharfe
mai
l
info: use
strcmp()
for s
t
ri
n
g
comparison
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-02
Michael Nau
m
ov
sideband
.
c:
do
n
ot use ANSI
c
ont
r
o
l sequ
e
nc
e
on non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-30
Juni
o
C
Hamano
Sync with 1
.
9
.
4
commit
|
commitdiff
|
tree
2014-05-30
Ju
n
io C Ha
m
ano
Git 1
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-30
Jeff King
t5537: re-dr
o
p ht
t
p t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-28
Junio C Haman
o
Merge branch 'rh/prompt-pcmode-av
o
id-eval
-
on-refname
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Juni
o
C Haman
o
Merge branch 'mw/symlinks' into
m
aint
commit
|
commitdiff
|
tree
2014-05-28
Junio C Ham
a
n
o
Git 2
.
0
commit
|
commitdiff
|
tree
2014-05-27
Øystein
W
a
l
l
e
config
:
respect '~'
a
n
d '~user'
in ma
i
lmap
.
f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-27
Ngu
y
ễn
T
hái Ngọc Duy
g
c
-
-auto
:
do no
t
lock refs in the backg
r
ound
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-27
John
Keeping
c
o
mpletion
:
a
d
d missing options for git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-27
John Ke
e
ping
completion: add a note tha
t
merge op
t
ions
a
r
e
shar
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
J
unio C H
a
man
o
U
pdate dr
a
ft release notes to 2
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
A
l
exey Sh
u
m
kin
pret
t
y
.
c: format
string with tru
n
cate respects logO
u
tputEncoding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
A
l
exey Shumk
i
n
t4205, t600
6
: add t
e
sts that fail with i18n
.
l
ogOutputE
n
codin
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shumkin
t
4205 (log-
p
retty-f
o
rmat): us
e
`tform
a
t` rath
e
r t
h
an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
A
l
exey Shumkin
t4041, t420
5
, t6006
,
t7102:
d
on'
t
h
ardcode te
s
ted encoding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
J
u
nio C H
a
man
o
Git 2
.
0-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Jason St
.
John
Re
l
Notes/2
.
0
.
0
.
tx
t
: F
i
x
several
gra
m
mar issues, not
a
bl
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hamano
R
e
vert "Merge bran
c
h 'jc/grad
u
ate-r
e
m
o
te-hg-bzr' (
e
arly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Jeff King
move "--follo
w
needs
o
ne pathspec" ru
l
e to diff_setup
_
done
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
J
unio C Hamano
Merge branch
'jc
/
graduate-remote-hg-
b
zr
'
(early part)
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hama
n
o
re
m
ote-
h
elp
e
rs: point at the
i
r upstr
e
am
repositori
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
F
e
l
ipe Con
t
reras
contrib: remote-helpe
r
s: a
d
d mo
v
e warnings (
v
2
.
0
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
J
u
nio C Ha
m
ano
Revert "Merge branch 'fc
/
transport-helper
-
sync-
e
rror
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
Mer
g
e branch 'rh/prompt-pcmode-avoid-eval-on
-
r
e
f
name'
commit
|
commitdiff
|
tree
2014-05-19
Richard Hansen
g
i
t-prompt
.
sh:
d
o
n't a
s
s
ume t
h
e
shell expands the val
u
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Alexey Shumkin
t
4
205 (log-pr
e
tty
-
formats): don't
h
a
rd
c
ode SH
A
-1 in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
Merge bra
n
ch 'lt
/
request-pull'
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
Merge branch 'jl/
u
s
e-vsa
t
isfy-correctly-for-2
.
0
'
commit
|
commitdiff
|
tree
2014-05-19
Junio C Haman
o
Mer
g
e git://git
h
ub
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-05-19
Juni
o
C
Ha
m
ano
M
e
r
g
e branch '
k
b
/fas
t
-hashmap'
commit
|
commitdiff
|
tree
2014-05-19
Anders
K
aseorg
Documentation/techni
c
al/api-has
h
map:
remove source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Jens
L
e
hman
n
git-gui: tolerate
major version chan
g
e
s
when compar
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-16
J
unio C
Haman
o
re
q
ue
s
t-pull: resurrect for-linus
-> t
a
gs/for-linus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-15
Johannes Schindelin
git
g
r
ep -O -i: if the pager is 'less
'
, pa
s
s the '
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-15
J
ef
f
King
open_sha1_fil
e
:
report "
m
os
t
interesting" errn
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-15
Jef
f
King
run_di
f
f_files: do not look
a
t
uninitializ
e
d
s
tat
data
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-13
Ju
n
i
o
C Ha
m
ano
M
erge
b
ran
c
h
'fc/prompt-zsh-read-fro
m
-fi
l
e'
commit
|
commitdiff
|
tree
2014-05-13
Fe
l
ipe C
o
ntreras
contrib: completi
o
n: fi
x
'
eread()'
namespace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-12
Jeff
Ki
n
g
index-pack: distinguish missing o
b
jects from type errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-12
J
u
nio
C
H
amano
Merge git:/
/
github
.
c
o
m/git-l10n
/
git-po
commit
|
commitdiff
|
tree
2014-05-09
Junio
C
Hamano
Git 2
.
0-
r
c3
commit
|
commitdiff
|
tree
2014-05-09
J
unio C Hamano
Sync
with 1
.
9
.
3
commit
|
commitdiff
|
tree
2014-05-09
Junio C Hamano
Git 1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
br
i
an m
.
car
l
son
blame
:
correct
l
y handle files r
e
gardle
s
s of
a
utocrlf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Dav
i
d Tu
r
ner
mv: allow renaming to
f
i
x case on case insensitive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Junio C
H
amano
Sync with mai
n
t
commit
|
commitdiff
|
tree
2014-05-08
Jonat
h
a
n
Niede
r
sh
e
l
l
doc:
r
emove stray "+" in exampl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Juni
o
C Hamano
M
er
g
e
g
i
t://github
.
com/git-l
1
0n/git-po
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Start pr
e
paring for 1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge branch 'cl/p4-use-dif
f
-tree'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge
b
ran
c
h 'rh/
p
rompt
-
p
cmode-av
o
id
-
eval-on-refname
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C
Hamano
Mer
g
e br
a
nch
'
km/avoid-non-function
-
re
t
u
rn-in-re
b
ase
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
J
u
nio C Hamano
Merge branch 'tb/unicode-6
.
3-zero-width
'
into m
a
int
commit
|
commitdiff
|
tree
2014-05-08
Junio
C
Ham
a
no
Merge branch
'
km/a
v
oid-bs-in-shell-glob'
i
nto maint
commit
|
commitdiff
|
tree
2014-05-08
Junio C Haman
o
Merge bra
n
ch 'km
/
a
void-cp-a' into m
a
int
commit
|
commitdiff
|
tree
2014-05-07
Junio C Hamano
Up
d
at
e
draft
r
elease
notes for 2
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
J
u
nio C Hamano
Merge
b
ranch
'
cl/p4-us
e
-
d
if
f
-tr
e
e'
commit
|
commitdiff
|
tree
2014-05-07
David Turner
m
e
r
ge-recursi
v
e
.
c
: fix case-changing merg
e
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
T
o
lga
Cey
l
an
git
-
p
4: format-patch to diff-tr
e
e
c
hange br
e
aks binary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
Ø
yvind
A
.
Holm
RelNotes/2
.
0
.
0:
Gramm
a
r
and typo
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-02
Jun
i
o C Hama
n
o
Git
2
.
0
-
rc2
commit
|
commitdiff
|
tree
2014-05-02
J
un
i
o C
Haman
o
Merge branch 'mw/s
y
ml
i
nks'
commit
|
commitdiff
|
tree
2014-05-02
Junio
C
H
a
mano
Merge b
r
anch 'km/git-
s
vn-workar
o
und-older-getopt-long'
commit
|
commitdiff
|
tree
2014-05-02
Junio C
Haman
o
Merge branch 'rh/promp
t
-pcmode-avoid-eval
-
on-re
f
n
ame'
commit
|
commitdiff
|
tree
2014-05-02
Junio
C
H
amano
Merge
branch 'mk/doc-git-g
u
i-d
i
splay-untracked'
commit
|
commitdiff
|
tree
2014-04-30
Junio C Hama
n
o
Merge git:/
/
g
ith
u
b
.
c
o
m/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-04-30
Junio C Hamano
Rev
e
rt the wh
o
le "ask cur
l
-
conf
i
g" t
o
p
ic f
o
r now
commit
|
commitdiff
|
tree
2014-04-30
F
e
l
ipe Contreras
rerer
e
:
fix for merge
.
c
onflictstyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-28
J
örn Engel
p
a
ger: d
o
allow
spawning
p
ager r
e
c
ursively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-28
Junio C Haman
o
Me
r
g
e
branc
h
'db
/
make-with-
c
url'
commit
|
commitdiff
|
tree
2014-04-28
Junio C Hamano
M
e
rge branch
'
j
k
/externa
l
-
diff-use-argv-arr
a
y
'
(early
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Dave Borowitz
Makefile: def
a
ult to -lcurl when
no
C
U
R
L_CONFIG or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next