repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rt/cherry-revert-conflict-summary' into maint
2012-03-26
Juni
o
C H
a
mano
Sync
with 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Git 1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
J
u
n
i
o C
H
a
ma
n
o
Me
r
ge branch
'
jn/maint-fast-import-empty-ls' into
m
aint
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C Hamano
Merge
b
ranc
h
'ph/rerere-doc' int
o
maint
commit
|
commitdiff
|
tree
2012-03-26
J
uni
o
C Hamano
Merge bra
n
ch
'ms/maint
-
confi
g
-error-at-eol-linec
o
unt
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark L
o
dato
grep d
o
c: add --break / --headi
n
g
/
-W to
s
ynopsis
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Ro
d
rigo Silva
(Me
s
tr
.
.
.
Docume
n
tation
:
im
p
r
o
ve descrip
t
ion of GIT_EDI
T
O
R
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Nelson
Benitez Leon
documentat
i
on: fix alphab
e
t
ic ordered list for git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
René S
c
harfe
com
b
ine-diff: fix loo
p
index underflow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-24
J
u
n
io C Hamano
M
erge g
i
tk changes f
r
om Pau
l
M
a
c
kerras at git:
/
/ozlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Junio
C Ham
a
no
Git 1
.
7
.
10-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
Ju
n
io C Hamano
.
ma
i
l
m
a
p: unify various old mail ad
d
resses of g
i
tster
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
Junio
C Ham
a
no
Merge branch 'am/
c
o
m
ple
t
i
on-zsh-fix'
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
Merge branc
h
'dw/gitweb
-
doc
-
gra
m
m
o'
commit
|
commitdiff
|
tree
2012-03-23
Jeff Ki
n
g
merge-recursive:
don't de
t
ect
rena
m
es of e
m
pty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
Jef
f
King
teach d
i
ffc
o
re-rename to optionally ig
n
ore e
m
pty content
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
Jef
f
King
m
ak
e
is_emp
t
y_blo
b
_sha1 available everywhere
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
Jeff King
drop
c
asts from u
s
ers EMPTY_TR
E
E_SHA1_BIN
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
D Waitzma
n
Do
c
umentation/gitweb: trivial English fixes
commit
|
commitdiff
|
tree
2012-03-21
Alex Merry
c
ontrib/com
p
letion
:
"local var=()" is misinterpreted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
i
o C Hamano
Merge branch 'maint-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-20
J
unio
C Hamano
merge: back
p
ort G
I
T_MERGE_AUTOEDIT
support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Junio C H
a
mano
Merge bran
c
h 'ks
/
sort-wild
c
ard-in-makefile
'
into
mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ham
a
no
Merge branch 'jc/ad
v
i
s
e
-i18n' into
mai
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Haman
o
Merge branc
h
'j
n
/g
i
tweb
-
uns
p
ec
i
f
ied-
a
c
t
ion
'
i
n
to main
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
L
uci
a
n Poston
t
4202: add test
f
or "lo
g
-
-
g
raph --stat
-p"
s
epar
a
tor
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Lucian Poston
log
-
-graph
:
fix break in graph
lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Lucian
P
oston
log -
-
graph --stat: three-dash se
p
arator should com
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-16
Junio C
H
amano
Mer
g
e b
r
anch
'
a
b
/pe
r
l-i18n'
commit
|
commitdiff
|
tree
2012-03-16
Æva
r
A
r
nfj
ö
r
ð B
j
armason
perl/Makefile: install Git::I18N under NO_PERL_MAKE
M
AKER
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-16
Junio C H
a
mano
U
pdate draft release notes to
1
.
7
.
10
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io C Hamano
M
e
rge
b
ranch 'th/merg
e
tools-deltawalker'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge br
a
nch 'jc/maint-
v
erify-o
b
jects-remove-pessimism'
commit
|
commitdiff
|
tree
2012-03-16
J
unio C Ham
a
no
Merge branch '
s
l/customize-sa
n
e
-too
l
-path'
commit
|
commitdiff
|
tree
2012-03-16
Juni
o
C Hamano
Merge
"
two fixes
f
or fast-import's '
l
s' command
"
fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C Haman
o
M
erge branch 'th/git-diffall'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge branch 'th/doc-diff-submodule-optio
n
'
commit
|
commitdiff
|
tree
2012-03-15
J
unio C Ham
a
no
fetch/receive
:
remove o
v
er-
p
ess
i
mistic connectivity
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Ti
m
H
e
nigan
Docu
m
en
t
atio
n
/difftool: add de
l
t
aw
a
lker to
list
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
J
unio C Hamano
c
l
ean:
p
reser
v
e nested gi
t
worktree in
subdirectories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
not
e
s
-
merge: Don'
t
remove
.
g
i
t
/
NOTES_MERGE_WO
R
KTREE
.
.
.
Inspired-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n
H
erland
notes-m
e
rge: use
op
e
n
dir/readdir instead of us
i
ng read_direc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herl
a
nd
t3310: i
l
l
u
stra
t
e failure to "n
o
t
e
s me
r
g
e
--commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Junio C Hamano
remove_dir_r
e
cu
r
sively(): Add f
l
ag fo
r
skippin
g
removal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
J
un
i
o C Hamano
G
it 1
.
7
.
10-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim He
n
i
gan
contrib
/
diffall: fix cleanup trap o
n
Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
T
i
m
H
enigan
contrib/di
f
fall:
e
liminate
duplicate while loops
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
cont
r
ib/dif
f
all: elimin
a
te us
e
of tar
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim
Hen
i
gan
contrib/diffall: c
r
eate
t
m
p dirs with
o
ut mktemp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
contrib/diffall: comment actual reason for
'
c
d
u
p'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Thoma
s
Rast
dif
f
:
t
weak
a
_copy_
o
f
d
i
ff
_
options w
i
t
h word-di
f
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
T
h
omas Rast
diff: refa
c
tor the
word
-
dif
f
set
u
p
from bu
i
ltin_d
i
f
f_cmd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Joh
a
nnes Sixt
t4034
:
diff
.
*
.
wordregex shoul
d
n
ot be "sticky" in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
D
o
cume
n
tation/dif
f
-
options: reword
des
c
ription of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
J
u
nio C Ha
m
ano
M
erge branch 'jc/i
1
8n-shell-scri
p
t-gettext'
commit
|
commitdiff
|
tree
2012-03-13
Juni
o
C Hamano
Mer
g
e branch
'
j
c/m
a
int-undefined-i1
8
n-observation
-
test
'
commit
|
commitdiff
|
tree
2012-03-13
J
u
ni
o
C
Hamano
Merge b
r
a
nch 'm
s
/maint-config-error-a
t
-eo
l
-linecoun
t
'
commit
|
commitdiff
|
tree
2012-03-13
Junio C
Hamano
Merge branc
h
'
p
h/rere
r
e-doc'
commit
|
commitdiff
|
tree
2012-03-13
Junio
C Ham
a
no
a
m: officially deprec
a
te
-
b/--binary option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio
C
Hamano
Update draft rele
a
se notes to 1
.
7
.
10 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
man
o
Mer
g
e branc
h
'a
z
/
v
e
rif
y
-
tag-use-
g
pg-config
'
commit
|
commitdiff
|
tree
2012-03-12
Junio
C
H
amano
Sync wit
h
1
.
7
.
9
.
4
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Gi
t
1
.
7
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio
C Hamano
Merg
e
b
r
anch 'tr/
m
aint-
b
und
l
e-boundary' into maint
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o
C Hamano
Merge branch '
j
c/maint-diff
-
patch-h
e
a
der' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ham
a
no
Merg
e
branch
'
j
n/m
a
int-do-not-match-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio
C
H
amano
Me
r
ge branch 'jc/am-3-n
o
n
s
tandard-popt' into maint
commit
|
commitdiff
|
tree
2012-03-12
Thomas Rast
g
it-am: er
r
or
o
ut when seeing
-
b
/--binary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ham
a
n
o
i18n: fix auto dete
c
tion of gette
x
t scheme fo
r
shell
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Mar
t
in Stenberg
config:
r
ep
o
r
t
er
r
ors at the EOL w
i
th correct l
i
ne
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Juni
o
C Hama
n
o
Me
r
ge htt
p
s://
g
i
thub
.
com/git-l10n/git-
p
o
commit
|
commitdiff
|
tree
2012-03-11
Juni
o
C
H
amano
commit: pass author
/
committer in
f
o to hooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-11
Jun
i
o C Hama
n
o
t75
0
3: d
o
e
s
pre-commit-ho
o
k
l
earn auth
o
rship?
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-11
Junio C Hama
n
o
ident
.
c: add split_id
e
nt_
l
ine() to parse fo
r
m
atte
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-10
Ævar A
r
nfjörð
B
jarmason
Gi
t
::I
1
8
N
: co
m
patibility with pe
r
l <
5
.
8
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-09
Junio
C Ham
a
no
t0204: clarify the "observe undef
i
ned b
e
havi
o
u
r"
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-09
Stef
a
n
o Lattar
i
ni
configure:
allow u
s
er to pr
e
ve
n
t $PATH "san
i
ti
z
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-09
Thomas Rast
p4000: use -3000 w
h
en pr
o
misi
n
g -3000
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere: Document 'r
e
rere remaining'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
Alex
Z
epeda
verify-tag: Parse GPG configu
r
a
t
ion optio
n
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
Junio C Hama
n
o
Upda
t
e draft relea
s
e
notes
t
o
1
.
7
.
1
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
J
unio C
H
amano
M
er
g
e
b
ranch 'k
b
/maint-pru
n
e-rmdir-
c
losedir
'
commit
|
commitdiff
|
tree
2012-03-08
Junio C Hamano
Merge branch 'jl/maint-submodu
l
e-relative'
commit
|
commitdiff
|
tree
2012-03-08
Junio C Hamano
Merge branch
'jn/
m
aint-do-not-match-with-unsa
n
itized
.
.
.
commit
|
commitdiff
|
tree
2012-03-08
Juni
o
C Hama
n
o
Merge b
r
anch 'vr/b
r
anch-doc'
commit
|
commitdiff
|
tree
2012-03-08
Thomas Rast
p
erf:
export
some impor
t
an
t
test
-
l
ib va
r
iab
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-08
Thoma
s
Rast
p
erf: loa
d
test
-
l
ib-functi
o
ns
f
rom th
e
correct directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-07
Junio C Hama
n
o
Git
1
.
7
.
10-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-07
Junio C Hamano
Merge branch 'jc/pickaxe-ignore-ca
s
e'
commit
|
commitdiff
|
tree
2012-03-07
Ka
r
sten Ble
e
s
fi
x
deletion
o
f
.
git/
o
b
j
e
cts sub-d
i
rec
t
ories
in git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Mer
g
e branch 'j
h
/
t
h
readab
l
e
-
symli
n
k-ch
e
ck'
commit
|
commitdiff
|
tree
2012-03-06
J
u
n
io C Hamano
Merge branch 'jc/maint-dif
f
-patch-header'
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
M
erge
bra
n
c
h
'th/mergetools-deltawalker'
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Merge br
a
nch 'cn/pull-reba
s
e-me
s
sage'
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Merge branch 'sl/
m
odern-t0000'
commit
|
commitdiff
|
tree
2012-03-06
Junio C Ham
a
no
Merge
b
ranch
'n
l
/
http-proxy-auth'
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Mer
g
e b
r
anch 'tr/ma
i
nt-bun
d
le-b
o
undary'
commit
|
commitdiff
|
tree
2012-03-06
Junio C
Hamano
Merge br
a
nch
'
zj/diff-stat-dyncol'
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Mer
g
e br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
next