summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* i18n: mark relative dates for translationJonathan Nieder2012-04-243-46/+62
* strbuf: convenience format functions with \n automatically appendedNguyễn Thái Ngọc Duy2012-04-242-0/+40
* Makefile: feed all header files to xgettextNguyễn Thái Ngọc Duy2012-04-231-17/+31
* RelNotes: the third batchJunio C Hamano2012-04-201-1/+27
* Merge branch 'js/spawn-via-shell-path-fix'Junio C Hamano2012-04-201-0/+4
|\
| * Do not use SHELL_PATH from build system in prepare_shell_cmd on WindowsJohannes Sixt2012-04-171-0/+4
* | Merge branch 'ct/advise-push-default'Junio C Hamano2012-04-2010-13/+99
|\ \
| * | Fix httpd tests that broke when non-ff push advice changedChristopher Tiwald2012-04-122-2/+2
| * | clean up struct ref's nonfastforward fieldct/advise-push-defaultJeff King2012-03-262-4/+3
| * | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-197-12/+99
* | | Merge branch 'bw/submodule-sed-solaris'Junio C Hamano2012-04-201-2/+3
|\ \ \
| * | | Avoid bug in Solaris xpg4/sed as used in submoduleBen Walton2012-04-091-2/+3
* | | | Merge branch 'jk/run-command-eacces'Junio C Hamano2012-04-206-7/+86
|\ \ \ \
| * | | | run-command: treat inaccessible directories as ENOENTJeff King2012-04-054-3/+80
| * | | | compat/mingw.[ch]: Change return type of exec functions to intRamsay Jones2012-04-052-4/+6
* | | | | Merge branch 'jc/push-upstream-sanity'Junio C Hamano2012-04-202-8/+72
|\ \ \ \ \
| * | | | | push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-052-8/+72
* | | | | | Merge branch 'jc/am-report-3way'Junio C Hamano2012-04-201-0/+6
|\ \ \ \ \ \
| * | | | | | am -3: list the paths that needed 3-way fallbackJunio C Hamano2012-03-281-0/+6
* | | | | | | Merge branch 'jb/am-include'Junio C Hamano2012-04-202-2/+4
|\ \ \ \ \ \ \
| * | | | | | | am: support --include optionJohannes Berg2012-03-282-2/+4
* | | | | | | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-04-202-7/+134
|\ \ \ \ \ \ \ \
| * | | | | | | | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-peopleJunio C Hamano2012-03-132-7/+134
* | | | | | | | | RelNotes: the second batch of topics graduated to 'master'Junio C Hamano2012-04-161-0/+41
* | | | | | | | | Merge branch 'jk/add-p-skip-conflicts'Junio C Hamano2012-04-162-7/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add--interactive: ignore unmerged entries in patch modeJeff King2012-04-052-7/+44
* | | | | | | | | | Merge branch 'jc/commit-unedited-template'Junio C Hamano2012-04-163-24/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-commit: rephrase the "initial-ness" of templatesJunio C Hamano2012-04-031-5/+8
| * | | | | | | | | | git-commit.txt: clarify -t requires editing messageAdam Monsen2012-04-011-5/+5
| * | | | | | | | | | commit: rephrase the error when user did not touch templated log messageJunio C Hamano2012-03-302-19/+47
| * | | | | | | | | | commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2012-03-302-0/+8
| * | | | | | | | | | t7501: test the right kind of breakageJunio C Hamano2012-03-301-0/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bw/spawn-via-shell-path'Junio C Hamano2012-04-162-1/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Use SHELL_PATH from build system in run_command.c:prepare_shell_cmdBen Walton2012-04-032-1/+12
* | | | | | | | | | Merge branch 'wk/gitweb-snapshot-use-if-modified-since'Junio C Hamano2012-04-162-27/+98
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitweb: add If-Modified-Since handling to git_snapshot().W. Trevor King2012-03-302-0/+43
| * | | | | | | | | | gitweb: refactor If-Modified-Since handlingW. Trevor King2012-03-302-29/+55
| * | | | | | | | | | gitweb: add `status` headers to git_feed() responses.W. Trevor King2012-03-301-2/+4
* | | | | | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env'Junio C Hamano2012-04-163-13/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http-backend: respect existing GIT_COMMITTER_* variablesJeff King2012-03-303-13/+37
* | | | | | | | | | | | Merge branch 'sl/autoconf'Junio C Hamano2012-04-161-98/+99
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | configure: be more idiomaticsl/autoconfStefano Lattarini2012-03-261-89/+87
| * | | | | | | | | | | | configure: avoid some code repetitions thanks to m4_{push,pop}defStefano Lattarini2012-03-261-12/+14
| * | | | | | | | | | | | configure: move definitions of private m4 macros before AC_INIT invocationStefano Lattarini2012-03-261-12/+13
* | | | | | | | | | | | | Merge branch 'jk/branch-quiet'Junio C Hamano2012-04-165-11/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | teach "git branch" a --quiet optionjk/branch-quietJeff King2012-03-262-6/+15
| * | | | | | | | | | | | | checkout: suppress tracking message with "-q"Jeff King2012-03-264-6/+8
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Junio C Hamano2012-04-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | combine-diff: fix loop index underflowrs/combine-diff-zero-context-at-the-beginningRené Scharfe2012-03-251-1/+1
* | | | | | | | | | | | | | Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-169-14/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \