summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* i18n: rebase: mark messages for translationJiang Xin2012-07-255-42/+53
* i18n: New keywords for xgettext extraction from shJiang Xin2012-07-251-1/+2
* Update draft release notes for 7th batchJunio C Hamano2012-07-151-0/+34
* Merge branch 'tg/maint-cache-name-compare'Junio C Hamano2012-07-152-4/+48
|\
| * cache_name_compare(): do not truncate while comparing pathsJunio C Hamano2012-07-112-4/+48
* | Merge branch 'jk/index-pack-streaming-fix'Junio C Hamano2012-07-151-10/+13
|\ \
| * | index-pack: loop while inflating objects in unpack_dataJeff King2012-07-101-10/+13
* | | Merge branch 'jk/maint-commit-amend-only-no-paths'Junio C Hamano2012-07-152-1/+14
|\ \ \
| * | | commit: fix "--amend --only" with no pathspecJeff King2012-07-102-1/+14
* | | | Merge branch 'cw/amend-commit-without-message'Junio C Hamano2012-07-152-1/+16
|\ \ \ \
| * | | | Allow edit of empty message with commit --amendChris Webb2012-07-092-1/+16
* | | | | Merge branch 'jn/makefile-cleanup'Junio C Hamano2012-07-152-102/+131
|\ \ \ \ \
| * | | | | Makefile: document ground rules for target-specific dependenciesJonathan Nieder2012-07-091-0/+33
| * | | | | Makefile: move GIT-VERSION-FILE dependencies closer to useJeff King2012-07-091-9/+4
| * | | | | Makefile: build instaweb similar to other scriptsJeff King2012-07-091-8/+6
| * | | | | Makefile: update scripts when build-time parameters changeJeff King2012-07-092-3/+14
| * | | | | Makefile: do not replace @@GIT_VERSION@@ in shell scriptsJeff King2012-07-091-3/+0
| * | | | | Makefile: split prefix flags from GIT-CFLAGSJeff King2012-07-092-8/+23
| * | | | | Makefile: be silent when only GIT_USER_AGENT changesJonathan Nieder2012-07-091-1/+0
| * | | | | Makefile: split GIT_USER_AGENT from GIT-CFLAGSJeff King2012-07-092-2/+10
| * | | | | Makefile: do not replace @@GIT_USER_AGENT@@ in scriptsJeff King2012-07-091-1/+0
| * | | | | Makefile: apply dependencies consistently to sparse/asm targetsJeff King2012-07-091-2/+2
| * | | | | Makefile: do not have git.o depend on common-cmds.hJeff King2012-07-091-1/+0
| * | | | | Makefile: fold XDIFF_H and VCSSVN_H into LIB_HJonathan Nieder2012-07-091-37/+25
| * | | | | Makefile: fold MISC_H into LIB_HJeff King2012-06-201-29/+16
| * | | | | Makefile: sort LIB_H listJeff King2012-06-201-4/+4
* | | | | | Merge branch 'ar/clone-honor-umask-at-top'Junio C Hamano2012-07-153-3/+3
|\ \ \ \ \ \
| * | | | | | add: create ADD_EDIT.patch with mode 0666Jeff King2012-07-091-1/+1
| * | | | | | rerere: make rr-cache fanout directory honor umaskJunio C Hamano2012-07-091-1/+1
| * | | | | | Restore umasks influence on the permissions of work tree created by cloneAlex Riesen2012-07-091-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/apply-3way'Junio C Hamano2012-07-154-118/+615
|\ \ \ \ \ \
| * | | | | | apply: tests for the --3way optionJunio C Hamano2012-07-091-0/+54
| * | | | | | apply: document --3way optionJunio C Hamano2012-07-091-1/+10
| * | | | | | apply: allow rerere() to work on --3way resultsJunio C Hamano2012-07-092-0/+28
| * | | | | | apply: register conflicted stages to the indexJunio C Hamano2012-07-092-6/+138
| * | | | | | apply: --3way with add/add conflictJunio C Hamano2012-07-091-8/+62
| * | | | | | apply: move verify_index_match() higherJunio C Hamano2012-07-091-10/+10
| * | | | | | apply: plug the three-way merge logic inJunio C Hamano2012-07-091-3/+50
| * | | | | | apply: fall back on three-way mergeJunio C Hamano2012-07-091-1/+45
| * | | | | | apply: accept -3/--3way command line optionJunio C Hamano2012-07-092-2/+31
| * | | | | | apply: move "already exists" logic to check_to_create()Junio C Hamano2012-07-091-11/+29
| * | | | | | apply: move check_to_create_blob() closer to its sole callerJunio C Hamano2012-07-091-23/+23
| * | | | | | apply: further split load_preimage()Junio C Hamano2012-07-091-19/+40
| * | | | | | apply: refactor "previous patch" logicJunio C Hamano2012-07-091-26/+56
| * | | | | | apply: split load_preimage() helper function outJunio C Hamano2012-07-091-3/+12
| * | | | | | apply: factor out checkout_target() helper functionJunio C Hamano2012-07-091-7/+13
| * | | | | | apply: refactor read_file_or_gitlink()Junio C Hamano2012-07-091-7/+11
| * | | | | | apply: clear_image() clears things a bit moreJunio C Hamano2012-07-091-2/+2
| * | | | | | apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano2012-07-091-2/+8
| * | | | | | apply: fix an incomplete comment in check_patch()Junio C Hamano2012-07-091-9/+15
View Lorry Controller Status